Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / fs / ext4 / fast_commit.c

diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index b33664f6ce2abdc16a0b0b165a833ebb6eda0092..26c4fc37edcf9ab8a1d77a27a59c1452a00506a2 100644 (file)
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -291,9 +291,9 @@ void ext4_fc_del(struct inode *inode)
                return;
 
 restart:
-       spin_lock(&EXT4_SB(inode->i_sb)->s_fc_lock);
+       spin_lock(&sbi->s_fc_lock);
        if (list_empty(&ei->i_fc_list) && list_empty(&ei->i_fc_dilist)) {
-               spin_unlock(&EXT4_SB(inode->i_sb)->s_fc_lock);
+               spin_unlock(&sbi->s_fc_lock);
                return;
        }
 
@@ -357,9 +357,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, int reason, handle_t *handl
        }
        spin_lock(&sbi->s_fc_lock);
        is_ineligible = ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
-       if (has_transaction &&
-           (!is_ineligible ||
-            (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid))))
+       if (has_transaction && (!is_ineligible || tid_gt(tid, sbi->s_fc_ineligible_tid)))
                sbi->s_fc_ineligible_tid = tid;
        ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE);
        spin_unlock(&sbi->s_fc_lock);