From: Ye Bin Date: Fri, 16 Sep 2022 08:38:36 +0000 (+0800) Subject: ext4: adjust fast commit disable judgement order in ext4_fc_track_inode X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e64e6ca90913b0dfe14bf7d529df0753a6746e23;p=users%2Fjedix%2Flinux-maple.git ext4: adjust fast commit disable judgement order in ext4_fc_track_inode If fastcommit is already disabled, there isn't need to mark inode ineligible. So move 'ext4_fc_disabled()' judgement bofore 'ext4_should_journal_data(inode)' judgement which can avoid to do meaningless judgement. Signed-off-by: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20220916083836.388347-3-yebin10@huawei.com Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index eadab945b8564..9217a588afd13 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -577,15 +577,15 @@ void ext4_fc_track_inode(handle_t *handle, struct inode *inode) if (S_ISDIR(inode->i_mode)) return; + if (ext4_fc_disabled(inode->i_sb)) + return; + if (ext4_should_journal_data(inode)) { ext4_fc_mark_ineligible(inode->i_sb, EXT4_FC_REASON_INODE_JOURNAL_DATA, handle); return; } - if (ext4_fc_disabled(inode->i_sb)) - return; - if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FC_INELIGIBLE)) return;