Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull final vfs updates from Al Viro:

 - The ->i_mutex wrappers (with small prereq in lustre)

 - a fix for too early freeing of symlink bodies on shmem (they need to
   be RCU-delayed) (-stable fodder)

 - followup to dedupe stuff merged this cycle

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: abort dedupe loop if fatal signals are pending
  make sure that freeing shmem fast symlinks is RCU-delayed
  wrappers for ->i_mutex access
  lustre: remove unused declaration

2 files changed, 5 insertions, 5 deletions

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 55e16e2402a7..52883ac3cf84 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -55,7 +55,7 @@ xfs_rw_ilock(
         int                     type)
 {
         if (type & XFS_IOLOCK_EXCL)
-                mutex_lock(&VFS_I(ip)->i_mutex);
+                inode_lock(VFS_I(ip));
         xfs_ilock(ip, type);
 }
 
@@ -66,7 +66,7 @@ xfs_rw_iunlock(
 {
         xfs_iunlock(ip, type);
         if (type & XFS_IOLOCK_EXCL)
-                mutex_unlock(&VFS_I(ip)->i_mutex);
+                inode_unlock(VFS_I(ip));
 }
 
 static inline void
@@ -76,7 +76,7 @@ xfs_rw_ilock_demote(
 {
         xfs_ilock_demote(ip, type);
         if (type & XFS_IOLOCK_EXCL)
-                mutex_unlock(&VFS_I(ip)->i_mutex);
+                inode_unlock(VFS_I(ip));
 }
 
 /*
diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c
index dc6221942b85..ade236e90bb3 100644
--- a/fs/xfs/xfs_pnfs.c
+++ b/fs/xfs/xfs_pnfs.c
@@ -42,11 +42,11 @@ xfs_break_layouts(
         while ((error = break_layout(inode, false) == -EWOULDBLOCK)) {
                 xfs_iunlock(ip, *iolock);
                 if (with_imutex && (*iolock & XFS_IOLOCK_EXCL))
-                        mutex_unlock(&inode->i_mutex);
+                        inode_unlock(inode);
                 error = break_layout(inode, true);
                 *iolock = XFS_IOLOCK_EXCL;
                 if (with_imutex)
-                        mutex_lock(&inode->i_mutex);
+                        inode_lock(inode);
                 xfs_ilock(ip, *iolock);
         }