wrappers for ->i_mutex access

parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested},
inode_foo(inode) being mutex_foo(&inode->i_mutex).

Please, use those for access to ->i_mutex; over the coming cycle
->i_mutex will become rwsem, with ->lookup() done with it held
only shared.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 7ab7ec9f4eed..7a0cfd3266e5 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -580,7 +580,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter,
         if (!count)
                 goto out;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
         result = nfs_sync_mapping(mapping);
         if (result)
                 goto out_unlock;
@@ -608,7 +608,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter,
         NFS_I(inode)->read_io += count;
         result = nfs_direct_read_schedule_iovec(dreq, iter, pos);
 
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 
         if (!result) {
                 result = nfs_direct_wait(dreq);
@@ -622,7 +622,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter,
 out_release:
         nfs_direct_req_release(dreq);
 out_unlock:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 out:
         return result;
 }
@@ -1005,7 +1005,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
         pos = iocb->ki_pos;
         end = (pos + iov_iter_count(iter) - 1) >> PAGE_CACHE_SHIFT;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         result = nfs_sync_mapping(mapping);
         if (result)
@@ -1045,7 +1045,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
                                               pos >> PAGE_CACHE_SHIFT, end);
         }
 
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 
         if (!result) {
                 result = nfs_direct_wait(dreq);
@@ -1066,7 +1066,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
 out_release:
         nfs_direct_req_release(dreq);
 out_unlock:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         return result;
 }