diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-02-23 18:27:47 -0500 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-23 18:27:47 -0500 |
| commit | 88e8fda99a4c99a1a6482510655dbd88cccd221b (patch) | |
| tree | b5f10ecc7c99ebf3eeb7a6733c15d3930b5f8a63 /fs/xfs/xfs_super.c | |
| parent | 4225441a1eec45241efe529d23403d8ca3d1d71b (diff) | |
| parent | 723cac48473358939759885a18e8df113ea96138 (diff) | |
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( | |||
| 966 | atomic_set(&ip->i_pincount, 0); | 966 | atomic_set(&ip->i_pincount, 0); |
| 967 | spin_lock_init(&ip->i_flags_lock); | 967 | spin_lock_init(&ip->i_flags_lock); |
| 968 | 968 | ||
| 969 | mrlock_init(&ip->i_mmaplock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, | ||
| 970 | "xfsino", ip->i_ino); | ||
| 969 | mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, | 971 | mrlock_init(&ip->i_lock, MRLOCK_ALLOW_EQUAL_PRI|MRLOCK_BARRIER, |
| 970 | "xfsino", ip->i_ino); | 972 | "xfsino", ip->i_ino); |
| 971 | } | 973 | } |