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>

3 files changed, 8 insertions, 8 deletions

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index d0f39dcbb58e..a4e867e08947 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -284,9 +284,9 @@ static int hfsplus_dir_release(struct inode *inode, struct file *file)
 {
         struct hfsplus_readdir_data *rd = file->private_data;
         if (rd) {
-                mutex_lock(&inode->i_mutex);
+                inode_lock(inode);
                 list_del(&rd->list);
-                mutex_unlock(&inode->i_mutex);
+                inode_unlock(inode);
                 kfree(rd);
         }
         return 0;
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 19b33f8151f1..1a6394cdb54e 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -229,14 +229,14 @@ static int hfsplus_file_release(struct inode *inode, struct file *file)
         if (HFSPLUS_IS_RSRC(inode))
                 inode = HFSPLUS_I(inode)->rsrc_inode;
         if (atomic_dec_and_test(&HFSPLUS_I(inode)->opencnt)) {
-                mutex_lock(&inode->i_mutex);
+                inode_lock(inode);
                 hfsplus_file_truncate(inode);
                 if (inode->i_flags & S_DEAD) {
                         hfsplus_delete_cat(inode->i_ino,
                                            HFSPLUS_SB(sb)->hidden_dir, NULL);
                         hfsplus_delete_inode(inode);
                 }
-                mutex_unlock(&inode->i_mutex);
+                inode_unlock(inode);
         }
         return 0;
 }
@@ -286,7 +286,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
         error = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (error)
                 return error;
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         /*
          * Sync inode metadata into the catalog and extent trees.
@@ -327,7 +327,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
         if (!test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags))
                 blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 
         return error;
 }
diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index 0624ce4e0702..32a49e292b6a 100644
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -93,7 +93,7 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
                 goto out_drop_write;
         }
 
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         if ((flags & (FS_IMMUTABLE_FL|FS_APPEND_FL)) ||
             inode->i_flags & (S_IMMUTABLE|S_APPEND)) {
@@ -126,7 +126,7 @@ static int hfsplus_ioctl_setflags(struct file *file, int __user *user_flags)
         mark_inode_dirty(inode);
 
 out_unlock_inode:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
 out_drop_write:
         mnt_drop_write_file(file);
 out: