diff options
author | Dave Chinner <david@fromorbit.com> | 2015-02-24 00:27:47 +0100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-02-24 00:27:47 +0100 |
commit | 88e8fda99a4c99a1a6482510655dbd88cccd221b (patch) | |
tree | b5f10ecc7c99ebf3eeb7a6733c15d3930b5f8a63 /fs/xfs/xfs_super.c | |
parent | Merge branch 'xfs-generic-sb-counters' into for-next (diff) | |
parent | xfs: lock out page faults from extent swap operations (diff) | |
download | linux-88e8fda99a4c99a1a6482510655dbd88cccd221b.tar.xz linux-88e8fda99a4c99a1a6482510655dbd88cccd221b.zip |
Merge branch 'xfs-mmap-lock' into for-next
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r-- | fs/xfs/xfs_super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index f32ad64c4d05..3ad0b17885f1 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -966,6 +966,8 @@ xfs_fs_inode_init_once( atomic_set(&ip->i_pincount, 0); spin_lock_init(&ip->i_flags_lock); + mrlock_init(&ip->i_mmaplock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, + "xfsino", ip->i_ino); mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, "xfsino", ip->i_ino); } |