summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-04 10:13:11 -0600
committerBen Myers <bpm@sgi.com>2013-02-07 09:39:48 -0600
commit311f08acde635e4e5ccea9b9d8c856cc2e0ced95 (patch)
tree8da8990b565b1d8c269ba20bf964d9115ac619cc
parenta21cd503678286c56b1d0cca1c99349a4aa042f4 (diff)
downloadlinux-stable-311f08acde635e4e5ccea9b9d8c856cc2e0ced95.tar.gz
linux-stable-311f08acde635e4e5ccea9b9d8c856cc2e0ced95.tar.bz2
linux-stable-311f08acde635e4e5ccea9b9d8c856cc2e0ced95.zip
xfs: memory barrier before wake_up_bit()
In xfs_ifunlock() there is a call to wake_up_bit() after clearing the flush lock on the xfs inode. This is not guaranteed to be safe, as noted in the comments above wake_up_bit() beginning with: In order for this to function properly, as it uses waitqueue_active() internally, some kind of memory barrier must be done prior to calling this. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Dave Chinner <david@fromorbit.com> Signed-off-by: Ben Myers <bpm@sgi.com>
-rw-r--r--fs/xfs/xfs_inode.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 22baf6ea4fac..237e7f6f2ab3 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -419,6 +419,7 @@ static inline void xfs_iflock(struct xfs_inode *ip)
static inline void xfs_ifunlock(struct xfs_inode *ip)
{
xfs_iflags_clear(ip, XFS_IFLOCK);
+ smp_mb();
wake_up_bit(&ip->i_flags, __XFS_IFLOCK_BIT);
}