diff options
author | Dave Chinner <dchinner@redhat.com> | 2010-12-23 11:57:13 +1100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2010-12-23 11:57:13 +1100 |
commit | dcfcf20512cb517ac18b9433b676183fa1257911 (patch) | |
tree | fd5551251e63f47dbb804e36cfd4cb3f15f5c322 /fs/xfs/linux-2.6/xfs_super.c | |
parent | 489a150f6454e2cd93d9e0ee6d7c5a361844f62a (diff) | |
download | kernel_samsung_espresso10-dcfcf20512cb517ac18b9433b676183fa1257911.zip kernel_samsung_espresso10-dcfcf20512cb517ac18b9433b676183fa1257911.tar.gz kernel_samsung_espresso10-dcfcf20512cb517ac18b9433b676183fa1257911.tar.bz2 |
xfs: provide a inode iolock lockdep class
The XFS iolock needs to be re-initialised to a new lock class before
it enters reclaim to prevent lockdep false positives. Unfortunately,
this is not sufficient protection as inodes in the XFS_IRECLAIMABLE
state can be recycled and not re-initialised before being reused.
We need to re-initialise the lock state when transfering out of
XFS_IRECLAIMABLE state to XFS_INEW, but we need to keep the same
class as if the inode was just allocated. Hence we need a specific
lockdep class variable for the iolock so that both initialisations
use the same class.
While there, add a specific class for inodes in the reclaim state so
that it is easy to tell from lockdep reports what state the inode
was in that generated the report.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 064f964..c45b323 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c @@ -1118,6 +1118,8 @@ xfs_fs_evict_inode( */ ASSERT(!rwsem_is_locked(&ip->i_iolock.mr_lock)); mrlock_init(&ip->i_iolock, MRLOCK_BARRIER, "xfsio", ip->i_ino); + lockdep_set_class_and_name(&ip->i_iolock.mr_lock, + &xfs_iolock_reclaimable, "xfs_iolock_reclaimable"); xfs_inactive(ip); } |