diff options
author | Dave Chinner <dchinner@redhat.com> | 2016-05-17 23:54:22 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2016-05-17 23:54:22 -0400 |
commit | 51b07f30a71c27405259a0248206ed4e22adbee2 (patch) | |
tree | a2ee265a4b570d7f42fa31e783b98781d4530160 /fs/xfs/xfs_inode.c | |
parent | b1438f477934f5a4d5a44df26f3079a7575d5946 (diff) |
xfs: fix inode validity check in xfs_iflush_cluster
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>
cc: <stable@vger.kernel.org> # 3.10.x-
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>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 696936cad0fa..a955b0212453 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -3205,13 +3205,13 @@ xfs_iflush_cluster( | |||
3205 | * We need to check under the i_flags_lock for a valid inode | 3205 | * We need to check under the i_flags_lock for a valid inode |
3206 | * here. Skip it if it is not valid or the wrong inode. | 3206 | * here. Skip it if it is not valid or the wrong inode. |
3207 | */ | 3207 | */ |
3208 | spin_lock(&ip->i_flags_lock); | 3208 | spin_lock(&iq->i_flags_lock); |
3209 | if (!ip->i_ino || | 3209 | if (!iq->i_ino || |
3210 | (XFS_INO_TO_AGINO(mp, iq->i_ino) & mask) != first_index) { | 3210 | (XFS_INO_TO_AGINO(mp, iq->i_ino) & mask) != first_index) { |
3211 | spin_unlock(&ip->i_flags_lock); | 3211 | spin_unlock(&iq->i_flags_lock); |
3212 | continue; | 3212 | continue; |
3213 | } | 3213 | } |
3214 | spin_unlock(&ip->i_flags_lock); | 3214 | spin_unlock(&iq->i_flags_lock); |
3215 | 3215 | ||
3216 | /* | 3216 | /* |
3217 | * Do an un-protected check to see if the inode is dirty and | 3217 | * Do an un-protected check to see if the inode is dirty and |