Skip to content

Commit baa7a74

Browse files
dgchinnergregkh
authored andcommitted
xfs: fix inode validity check in xfs_iflush_cluster
commit 51b07f30a71c27405259a0248206ed4e22adbee2 upstream. Some careless idiot(*) wrote crap code in commit 1a3e8f3 ("xfs: convert inode cache lookups to use RCU locking") back in late 2010, and so xfs_iflush_cluster checks the wrong inode for whether it is still valid under RCU protection. Fix it to lock and check the correct inode. (*) Careless-idiot: Dave Chinner <dchinner@redhat.com> Discovered-by: Brain Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <david@fromorbit.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7dc8f21 commit baa7a74

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fs/xfs/xfs_inode.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3220,13 +3220,13 @@ xfs_iflush_cluster(
32203220
* We need to check under the i_flags_lock for a valid inode
32213221
* here. Skip it if it is not valid or the wrong inode.
32223222
*/
3223-
spin_lock(&ip->i_flags_lock);
3224-
if (!ip->i_ino ||
3223+
spin_lock(&iq->i_flags_lock);
3224+
if (!iq->i_ino ||
32253225
(XFS_INO_TO_AGINO(mp, iq->i_ino) & mask) != first_index) {
3226-
spin_unlock(&ip->i_flags_lock);
3226+
spin_unlock(&iq->i_flags_lock);
32273227
continue;
32283228
}
3229-
spin_unlock(&ip->i_flags_lock);
3229+
spin_unlock(&iq->i_flags_lock);
32303230

32313231
/*
32323232
* Do an un-protected check to see if the inode is dirty and

0 commit comments

Comments
 (0)