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>

5 files changed, 17 insertions, 17 deletions

diff --git a/fs/ceph/cache.c b/fs/ceph/cache.c
index a4766ded1ba7..7680e2626815 100644
--- a/fs/ceph/cache.c
+++ b/fs/ceph/cache.c
@@ -197,7 +197,7 @@ void ceph_fscache_register_inode_cookie(struct ceph_fs_client* fsc,
                 return;
 
         /* Avoid multiple racing open requests */
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         if (ci->fscache)
                 goto done;
@@ -207,7 +207,7 @@ void ceph_fscache_register_inode_cookie(struct ceph_fs_client* fsc,
                                              ci, true);
         fscache_check_consistency(ci->fscache);
 done:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 
 }
 
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index c69e1253b47b..cdbf8cf3d52c 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2030,7 +2030,7 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         if (datasync)
                 goto out;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         dirty = try_flush_caps(inode, &flush_tid);
         dout("fsync dirty caps are %s\n", ceph_cap_string(dirty));
@@ -2046,7 +2046,7 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 ret = wait_event_interruptible(ci->i_cap_wq,
                                         caps_are_flushed(inode, flush_tid));
         }
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 out:
         dout("fsync %p%s result=%d\n", inode, datasync ? " datasync" : "", ret);
         return ret;
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 9314b4ea2375..fd11fb231a2e 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -507,7 +507,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence)
         loff_t old_offset = ceph_make_fpos(fi->frag, fi->next_offset);
         loff_t retval;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
         retval = -EINVAL;
         switch (whence) {
         case SEEK_CUR:
@@ -542,7 +542,7 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence)
                 }
         }
 out:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         return retval;
 }
 
diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index fe02ae7f056a..3b3172357326 100644
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -215,7 +215,7 @@ static int ceph_get_name(struct dentry *parent, char *name,
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        mutex_lock(&d_inode(parent)->i_mutex);
+        inode_lock(d_inode(parent));
 
         req->r_inode = d_inode(child);
         ihold(d_inode(child));
@@ -224,7 +224,7 @@ static int ceph_get_name(struct dentry *parent, char *name,
         req->r_num_caps = 2;
         err = ceph_mdsc_do_request(mdsc, NULL, req);
 
-        mutex_unlock(&d_inode(parent)->i_mutex);
+        inode_unlock(d_inode(parent));
 
         if (!err) {
                 struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 3c68e6aee2f0..10c5ae79696e 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1014,7 +1014,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (!prealloc_cf)
                 return -ENOMEM;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = inode_to_bdi(inode);
@@ -1070,7 +1070,7 @@ retry_snap:
             (iocb->ki_flags & IOCB_DIRECT) || (fi->flags & CEPH_F_SYNC)) {
                 struct ceph_snap_context *snapc;
                 struct iov_iter data;
-                mutex_unlock(&inode->i_mutex);
+                inode_unlock(inode);
 
                 spin_lock(&ci->i_ceph_lock);
                 if (__ceph_have_pending_cap_snap(ci)) {
@@ -1097,7 +1097,7 @@ retry_snap:
                                 "got EOLDSNAPC, retrying\n",
                                 inode, ceph_vinop(inode),
                                 pos, (unsigned)count);
-                        mutex_lock(&inode->i_mutex);
+                        inode_lock(inode);
                         goto retry_snap;
                 }
                 if (written > 0)
@@ -1117,7 +1117,7 @@ retry_snap:
                         iocb->ki_pos = pos + written;
                 if (inode->i_size > old_size)
                         ceph_fscache_update_objectsize(inode);
-                mutex_unlock(&inode->i_mutex);
+                inode_unlock(inode);
         }
 
         if (written >= 0) {
@@ -1147,7 +1147,7 @@ retry_snap:
         goto out_unlocked;
 
 out:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 out_unlocked:
         ceph_free_cap_flush(prealloc_cf);
         current->backing_dev_info = NULL;
@@ -1162,7 +1162,7 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
         struct inode *inode = file->f_mapping->host;
         int ret;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         if (whence == SEEK_END || whence == SEEK_DATA || whence == SEEK_HOLE) {
                 ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE, false);
@@ -1207,7 +1207,7 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
         offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
 
 out:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         return offset;
 }
 
@@ -1363,7 +1363,7 @@ static long ceph_fallocate(struct file *file, int mode,
         if (!prealloc_cf)
                 return -ENOMEM;
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         if (ceph_snap(inode) != CEPH_NOSNAP) {
                 ret = -EROFS;
@@ -1418,7 +1418,7 @@ static long ceph_fallocate(struct file *file, int mode,
 
         ceph_put_cap_refs(ci, got);
 unlock:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         ceph_free_cap_flush(prealloc_cf);
         return ret;
 }