VFS: assorted weird filesystems: d_inode() annotations

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 18 insertions, 18 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 33c45dfcbd88..1ca8e32a9592 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -82,14 +82,14 @@ static int create_file(const char *name, umode_t mode,
 {
         int error;
 
-        mutex_lock(&parent->d_inode->i_mutex);
+        mutex_lock(&d_inode(parent)->i_mutex);
         *dentry = lookup_one_len(name, parent, strlen(name));
         if (!IS_ERR(*dentry))
-                error = ipathfs_mknod(parent->d_inode, *dentry,
+                error = ipathfs_mknod(d_inode(parent), *dentry,
                                       mode, fops, data);
         else
                 error = PTR_ERR(*dentry);
-        mutex_unlock(&parent->d_inode->i_mutex);
+        mutex_unlock(&d_inode(parent)->i_mutex);
 
         return error;
 }
@@ -277,11 +277,11 @@ static int remove_file(struct dentry *parent, char *name)
         }
 
         spin_lock(&tmp->d_lock);
-        if (!d_unhashed(tmp) && tmp->d_inode) {
+        if (!d_unhashed(tmp) && d_really_is_positive(tmp)) {
                 dget_dlock(tmp);
                 __d_drop(tmp);
                 spin_unlock(&tmp->d_lock);
-                simple_unlink(parent->d_inode, tmp);
+                simple_unlink(d_inode(parent), tmp);
         } else
                 spin_unlock(&tmp->d_lock);
 
@@ -302,7 +302,7 @@ static int remove_device_files(struct super_block *sb,
         int ret;
 
         root = dget(sb->s_root);
-        mutex_lock(&root->d_inode->i_mutex);
+        mutex_lock(&d_inode(root)->i_mutex);
         snprintf(unit, sizeof unit, "%02d", dd->ipath_unit);
         dir = lookup_one_len(unit, root, strlen(unit));
 
@@ -315,10 +315,10 @@ static int remove_device_files(struct super_block *sb,
         remove_file(dir, "flash");
         remove_file(dir, "atomic_counters");
         d_delete(dir);
-        ret = simple_rmdir(root->d_inode, dir);
+        ret = simple_rmdir(d_inode(root), dir);
 
 bail:
-        mutex_unlock(&root->d_inode->i_mutex);
+        mutex_unlock(&d_inode(root)->i_mutex);
         dput(root);
         return ret;
 }
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index 650897a8591e..bdd5d3857203 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -89,14 +89,14 @@ static int create_file(const char *name, umode_t mode,
 {
         int error;
 
-        mutex_lock(&parent->d_inode->i_mutex);
+        mutex_lock(&d_inode(parent)->i_mutex);
         *dentry = lookup_one_len(name, parent, strlen(name));
         if (!IS_ERR(*dentry))
-                error = qibfs_mknod(parent->d_inode, *dentry,
+                error = qibfs_mknod(d_inode(parent), *dentry,
                                     mode, fops, data);
         else
                 error = PTR_ERR(*dentry);
-        mutex_unlock(&parent->d_inode->i_mutex);
+        mutex_unlock(&d_inode(parent)->i_mutex);
 
         return error;
 }
@@ -455,10 +455,10 @@ static int remove_file(struct dentry *parent, char *name)
         }
 
         spin_lock(&tmp->d_lock);
-        if (!d_unhashed(tmp) && tmp->d_inode) {
+        if (!d_unhashed(tmp) && d_really_is_positive(tmp)) {
                 __d_drop(tmp);
                 spin_unlock(&tmp->d_lock);
-                simple_unlink(parent->d_inode, tmp);
+                simple_unlink(d_inode(parent), tmp);
         } else {
                 spin_unlock(&tmp->d_lock);
         }
@@ -481,7 +481,7 @@ static int remove_device_files(struct super_block *sb,
         int ret, i;
 
         root = dget(sb->s_root);
-        mutex_lock(&root->d_inode->i_mutex);
+        mutex_lock(&d_inode(root)->i_mutex);
         snprintf(unit, sizeof(unit), "%u", dd->unit);
         dir = lookup_one_len(unit, root, strlen(unit));
 
@@ -491,7 +491,7 @@ static int remove_device_files(struct super_block *sb,
                 goto bail;
         }
 
-        mutex_lock(&dir->d_inode->i_mutex);
+        mutex_lock(&d_inode(dir)->i_mutex);
         remove_file(dir, "counters");
         remove_file(dir, "counter_names");
         remove_file(dir, "portcounter_names");
@@ -506,13 +506,13 @@ static int remove_device_files(struct super_block *sb,
                 }
         }
         remove_file(dir, "flash");
-        mutex_unlock(&dir->d_inode->i_mutex);
-        ret = simple_rmdir(root->d_inode, dir);
+        mutex_unlock(&d_inode(dir)->i_mutex);
+        ret = simple_rmdir(d_inode(root), dir);
         d_delete(dir);
         dput(dir);
 
 bail:
-        mutex_unlock(&root->d_inode->i_mutex);
+        mutex_unlock(&d_inode(root)->i_mutex);
         dput(root);
         return ret;
 }