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, 13 insertions, 13 deletions

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index e49bd2808bf3..795992a8321e 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -515,8 +515,8 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
         dbg_gen("dent '%pd' to ino %lu (nlink %d) in dir ino %lu",
                 dentry, inode->i_ino,
                 inode->i_nlink, dir->i_ino);
-        ubifs_assert(mutex_is_locked(&dir->i_mutex));
-        ubifs_assert(mutex_is_locked(&inode->i_mutex));
+        ubifs_assert(inode_is_locked(dir));
+        ubifs_assert(inode_is_locked(inode));
 
         err = dbg_check_synced_i_size(c, inode);
         if (err)
@@ -572,8 +572,8 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
         dbg_gen("dent '%pd' from ino %lu (nlink %d) in dir ino %lu",
                 dentry, inode->i_ino,
                 inode->i_nlink, dir->i_ino);
-        ubifs_assert(mutex_is_locked(&dir->i_mutex));
-        ubifs_assert(mutex_is_locked(&inode->i_mutex));
+        ubifs_assert(inode_is_locked(dir));
+        ubifs_assert(inode_is_locked(inode));
         err = dbg_check_synced_i_size(c, inode);
         if (err)
                 return err;
@@ -661,8 +661,8 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
 
         dbg_gen("directory '%pd', ino %lu in dir ino %lu", dentry,
                 inode->i_ino, dir->i_ino);
-        ubifs_assert(mutex_is_locked(&dir->i_mutex));
-        ubifs_assert(mutex_is_locked(&inode->i_mutex));
+        ubifs_assert(inode_is_locked(dir));
+        ubifs_assert(inode_is_locked(inode));
         err = check_dir_empty(c, d_inode(dentry));
         if (err)
                 return err;
@@ -996,10 +996,10 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
         dbg_gen("dent '%pd' ino %lu in dir ino %lu to dent '%pd' in dir ino %lu",
                 old_dentry, old_inode->i_ino, old_dir->i_ino,
                 new_dentry, new_dir->i_ino);
-        ubifs_assert(mutex_is_locked(&old_dir->i_mutex));
-        ubifs_assert(mutex_is_locked(&new_dir->i_mutex));
+        ubifs_assert(inode_is_locked(old_dir));
+        ubifs_assert(inode_is_locked(new_dir));
         if (unlink)
-                ubifs_assert(mutex_is_locked(&new_inode->i_mutex));
+                ubifs_assert(inode_is_locked(new_inode));
 
 
         if (unlink && is_dir) {
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index eff62801acbf..065c88f8e4b8 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1317,7 +1317,7 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         err = filemap_write_and_wait_range(inode->i_mapping, start, end);
         if (err)
                 return err;
-        mutex_lock(&inode->i_mutex);
+        inode_lock(inode);
 
         /* Synchronize the inode unless this is a 'datasync()' call. */
         if (!datasync || (inode->i_state & I_DIRTY_DATASYNC)) {
@@ -1332,7 +1332,7 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
          */
         err = ubifs_sync_wbufs_by_inode(c, inode);
 out:
-        mutex_unlock(&inode->i_mutex);
+        inode_unlock(inode);
         return err;
 }
 
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index e53292d0c21b..c7f4d434d098 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -313,7 +313,7 @@ static int setxattr(struct inode *host, const char *name, const void *value,
         union ubifs_key key;
         int err, type;
 
-        ubifs_assert(mutex_is_locked(&host->i_mutex));
+        ubifs_assert(inode_is_locked(host));
 
         if (size > UBIFS_MAX_INO_DATA)
                 return -ERANGE;
@@ -550,7 +550,7 @@ int ubifs_removexattr(struct dentry *dentry, const char *name)
 
         dbg_gen("xattr '%s', ino %lu ('%pd')", name,
                 host->i_ino, dentry);
-        ubifs_assert(mutex_is_locked(&host->i_mutex));
+        ubifs_assert(inode_is_locked(host));
 
         err = check_namespace(&nm);
         if (err < 0)