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

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index eff6319d5037..d894e7cd9a86 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -248,9 +248,9 @@ static int ovl_copy_up_locked(struct dentry *workdir, struct dentry *upperdir,
         if (err)
                 goto out_cleanup;
 
-        mutex_lock(&newdentry->d_inode->i_mutex);
+        inode_lock(newdentry->d_inode);
         err = ovl_set_attr(newdentry, stat);
-        mutex_unlock(&newdentry->d_inode->i_mutex);
+        inode_unlock(newdentry->d_inode);
         if (err)
                 goto out_cleanup;
 
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 692ceda3bc21..ed95272d57a6 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -167,7 +167,7 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
         struct dentry *newdentry;
         int err;
 
-        mutex_lock_nested(&udir->i_mutex, I_MUTEX_PARENT);
+        inode_lock_nested(udir, I_MUTEX_PARENT);
         newdentry = lookup_one_len(dentry->d_name.name, upperdir,
                                    dentry->d_name.len);
         err = PTR_ERR(newdentry);
@@ -185,7 +185,7 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
 out_dput:
         dput(newdentry);
 out_unlock:
-        mutex_unlock(&udir->i_mutex);
+        inode_unlock(udir);
         return err;
 }
 
@@ -258,9 +258,9 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,
         if (err)
                 goto out_cleanup;
 
-        mutex_lock(&opaquedir->d_inode->i_mutex);
+        inode_lock(opaquedir->d_inode);
         err = ovl_set_attr(opaquedir, &stat);
-        mutex_unlock(&opaquedir->d_inode->i_mutex);
+        inode_unlock(opaquedir->d_inode);
         if (err)
                 goto out_cleanup;
 
@@ -599,7 +599,7 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
         struct dentry *upper = ovl_dentry_upper(dentry);
         int err;
 
-        mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
+        inode_lock_nested(dir, I_MUTEX_PARENT);
         err = -ESTALE;
         if (upper->d_parent == upperdir) {
                 /* Don't let d_delete() think it can reset d_inode */
@@ -619,7 +619,7 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
          * now.
          */
         d_drop(dentry);
-        mutex_unlock(&dir->i_mutex);
+        inode_unlock(dir);
 
         return err;
 }
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index bf996e574f3d..49e204560655 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -63,9 +63,9 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)
         if (!err) {
                 upperdentry = ovl_dentry_upper(dentry);
 
-                mutex_lock(&upperdentry->d_inode->i_mutex);
+                inode_lock(upperdentry->d_inode);
                 err = notify_change(upperdentry, attr, NULL);
-                mutex_unlock(&upperdentry->d_inode->i_mutex);
+                inode_unlock(upperdentry->d_inode);
         }
         ovl_drop_write(dentry);
 out:
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index adcb1398c481..fdaf28f75e12 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -228,7 +228,7 @@ static int ovl_check_whiteouts(struct dentry *dir, struct ovl_readdir_data *rdd)
                                 dput(dentry);
                         }
                 }
-                mutex_unlock(&dir->d_inode->i_mutex);
+                inode_unlock(dir->d_inode);
         }
         revert_creds(old_cred);
         put_cred(override_cred);
@@ -399,7 +399,7 @@ static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
         loff_t res;
         struct ovl_dir_file *od = file->private_data;
 
-        mutex_lock(&file_inode(file)->i_mutex);
+        inode_lock(file_inode(file));
         if (!file->f_pos)
                 ovl_dir_reset(file);
 
@@ -429,7 +429,7 @@ static loff_t ovl_dir_llseek(struct file *file, loff_t offset, int origin)
                 res = offset;
         }
 out_unlock:
-        mutex_unlock(&file_inode(file)->i_mutex);
+        inode_unlock(file_inode(file));
 
         return res;
 }
@@ -454,10 +454,10 @@ static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
                         ovl_path_upper(dentry, &upperpath);
                         realfile = ovl_path_open(&upperpath, O_RDONLY);
                         smp_mb__before_spinlock();
-                        mutex_lock(&inode->i_mutex);
+                        inode_lock(inode);
                         if (!od->upperfile) {
                                 if (IS_ERR(realfile)) {
-                                        mutex_unlock(&inode->i_mutex);
+                                        inode_unlock(inode);
                                         return PTR_ERR(realfile);
                                 }
                                 od->upperfile = realfile;
@@ -467,7 +467,7 @@ static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
                                         fput(realfile);
                                 realfile = od->upperfile;
                         }
-                        mutex_unlock(&inode->i_mutex);
+                        inode_unlock(inode);
                 }
         }
 
@@ -479,9 +479,9 @@ static int ovl_dir_release(struct inode *inode, struct file *file)
         struct ovl_dir_file *od = file->private_data;
 
         if (od->cache) {
-                mutex_lock(&inode->i_mutex);
+                inode_lock(inode);
                 ovl_cache_put(od, file->f_path.dentry);
-                mutex_unlock(&inode->i_mutex);
+                inode_unlock(inode);
         }
         fput(od->realfile);
         if (od->upperfile)
@@ -557,7 +557,7 @@ void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list)
 {
         struct ovl_cache_entry *p;
 
-        mutex_lock_nested(&upper->d_inode->i_mutex, I_MUTEX_CHILD);
+        inode_lock_nested(upper->d_inode, I_MUTEX_CHILD);
         list_for_each_entry(p, list, l_node) {
                 struct dentry *dentry;
 
@@ -575,5 +575,5 @@ void ovl_cleanup_whiteouts(struct dentry *upper, struct list_head *list)
                         ovl_cleanup(upper->d_inode, dentry);
                 dput(dentry);
         }
-        mutex_unlock(&upper->d_inode->i_mutex);
+        inode_unlock(upper->d_inode);
 }
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index d250604f985a..8d826bd56b26 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -229,7 +229,7 @@ void ovl_dentry_update(struct dentry *dentry, struct dentry *upperdentry)
 {
         struct ovl_entry *oe = dentry->d_fsdata;
 
-        WARN_ON(!mutex_is_locked(&upperdentry->d_parent->d_inode->i_mutex));
+        WARN_ON(!inode_is_locked(upperdentry->d_parent->d_inode));
         WARN_ON(oe->__upperdentry);
         BUG_ON(!upperdentry->d_inode);
         /*
@@ -244,7 +244,7 @@ void ovl_dentry_version_inc(struct dentry *dentry)
 {
         struct ovl_entry *oe = dentry->d_fsdata;
 
-        WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
+        WARN_ON(!inode_is_locked(dentry->d_inode));
         oe->version++;
 }
 
@@ -252,7 +252,7 @@ u64 ovl_dentry_version_get(struct dentry *dentry)
 {
         struct ovl_entry *oe = dentry->d_fsdata;
 
-        WARN_ON(!mutex_is_locked(&dentry->d_inode->i_mutex));
+        WARN_ON(!inode_is_locked(dentry->d_inode));
         return oe->version;
 }
 
@@ -375,9 +375,9 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir,
 {
         struct dentry *dentry;
 
-        mutex_lock(&dir->d_inode->i_mutex);
+        inode_lock(dir->d_inode);
         dentry = lookup_one_len(name->name, dir, name->len);
-        mutex_unlock(&dir->d_inode->i_mutex);
+        inode_unlock(dir->d_inode);
 
         if (IS_ERR(dentry)) {
                 if (PTR_ERR(dentry) == -ENOENT)
@@ -744,7 +744,7 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt,
         if (err)
                 return ERR_PTR(err);
 
-        mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
+        inode_lock_nested(dir, I_MUTEX_PARENT);
 retry:
         work = lookup_one_len(OVL_WORKDIR_NAME, dentry,
                               strlen(OVL_WORKDIR_NAME));
@@ -770,7 +770,7 @@ retry:
                         goto out_dput;
         }
 out_unlock:
-        mutex_unlock(&dir->i_mutex);
+        inode_unlock(dir);
         mnt_drop_write(mnt);
 
         return work;