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>

2 files changed, 6 insertions, 6 deletions

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index fda9f4311212..42e731b8c80a 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -427,13 +427,13 @@ static int coda_readdir(struct file *coda_file, struct dir_context *ctx)
         if (host_file->f_op->iterate) {
                 struct inode *host_inode = file_inode(host_file);
 
-                mutex_lock(&host_inode->i_mutex);
+                inode_lock(host_inode);
                 ret = -ENOENT;
                 if (!IS_DEADDIR(host_inode)) {
                         ret = host_file->f_op->iterate(host_file, ctx);
                         file_accessed(host_file);
                 }
-                mutex_unlock(&host_inode->i_mutex);
+                inode_unlock(host_inode);
                 return ret;
         }
         /* Venus: we must read Venus dirents from a file */
diff --git a/fs/coda/file.c b/fs/coda/file.c
index 1da3805f3ddc..f47c7483863b 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -71,12 +71,12 @@ coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to)
 
         host_file = cfi->cfi_container;
         file_start_write(host_file);
-        mutex_lock(&coda_inode->i_mutex);
+        inode_lock(coda_inode);
         ret = vfs_iter_write(cfi->cfi_container, to, &iocb->ki_pos);
         coda_inode->i_size = file_inode(host_file)->i_size;
         coda_inode->i_blocks = (coda_inode->i_size + 511) >> 9;
         coda_inode->i_mtime = coda_inode->i_ctime = CURRENT_TIME_SEC;
-        mutex_unlock(&coda_inode->i_mutex);
+        inode_unlock(coda_inode);
         file_end_write(host_file);
         return ret;
 }
@@ -203,7 +203,7 @@ int coda_fsync(struct file *coda_file, loff_t start, loff_t end, int datasync)
         err = filemap_write_and_wait_range(coda_inode->i_mapping, start, end);
         if (err)
                 return err;
-        mutex_lock(&coda_inode->i_mutex);
+        inode_lock(coda_inode);
 
         cfi = CODA_FTOC(coda_file);
         BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
@@ -212,7 +212,7 @@ int coda_fsync(struct file *coda_file, loff_t start, loff_t end, int datasync)
         err = vfs_fsync(host_file, datasync);
         if (!err && !datasync)
                 err = venus_fsync(coda_inode->i_sb, coda_i2f(coda_inode));
-        mutex_unlock(&coda_inode->i_mutex);
+        inode_unlock(coda_inode);
 
         return err;
 }