VFS: security/: d_inode() annotations

... except where that code acts as a filesystem driver, rather than
working with dentries given to it.

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

4 files changed, 12 insertions, 12 deletions

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 7db9954f1af2..ad4fa49ad1db 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -365,7 +365,7 @@ void __aa_fs_profile_rmdir(struct aa_profile *profile)
                 if (!profile->dents[i])
                         continue;
 
-                r = profile->dents[i]->d_inode->i_private;
+                r = d_inode(profile->dents[i])->i_private;
                 securityfs_remove(profile->dents[i]);
                 aa_put_replacedby(r);
                 profile->dents[i] = NULL;
diff --git a/security/inode.c b/security/inode.c
index 131a3c49f766..91503b79c5f8 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -27,7 +27,7 @@ static int mount_count;
 
 static inline int positive(struct dentry *dentry)
 {
-        return dentry->d_inode && !d_unhashed(dentry);
+        return d_really_is_positive(dentry) && !d_unhashed(dentry);
 }
 
 static int fill_super(struct super_block *sb, void *data, int silent)
@@ -102,14 +102,14 @@ struct dentry *securityfs_create_file(const char *name, umode_t mode,
         if (!parent)
                 parent = mount->mnt_root;
 
-        dir = parent->d_inode;
+        dir = d_inode(parent);
 
         mutex_lock(&dir->i_mutex);
         dentry = lookup_one_len(name, parent, strlen(name));
         if (IS_ERR(dentry))
                 goto out;
 
-        if (dentry->d_inode) {
+        if (d_really_is_positive(dentry)) {
                 error = -EEXIST;
                 goto out1;
         }
@@ -197,20 +197,20 @@ void securityfs_remove(struct dentry *dentry)
                 return;
 
         parent = dentry->d_parent;
-        if (!parent || !parent->d_inode)
+        if (!parent || d_really_is_negative(parent))
                 return;
 
-        mutex_lock(&parent->d_inode->i_mutex);
+        mutex_lock(&d_inode(parent)->i_mutex);
         if (positive(dentry)) {
-                if (dentry->d_inode) {
+                if (d_really_is_positive(dentry)) {
                         if (d_is_dir(dentry))
-                                simple_rmdir(parent->d_inode, dentry);
+                                simple_rmdir(d_inode(parent), dentry);
                         else
-                                simple_unlink(parent->d_inode, dentry);
+                                simple_unlink(d_inode(parent), dentry);
                         dput(dentry);
                 }
         }
-        mutex_unlock(&parent->d_inode->i_mutex);
+        mutex_unlock(&d_inode(parent)->i_mutex);
         simple_release_fs(&mount, &mount_count);
 }
 EXPORT_SYMBOL_GPL(securityfs_remove);
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 5fde34326dcf..d2787cca1fcb 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1737,7 +1737,7 @@ static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
         inc_nlink(inode);
         d_add(dentry, inode);
         /* bump link count on parent directory, too */
-        inc_nlink(dir->d_inode);
+        inc_nlink(d_inode(dir));
 
         return dentry;
 }
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index bce4e8f1b267..2611a651c344 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -2395,7 +2395,7 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent)
                 return rc;
         }
 
-        root_inode = sb->s_root->d_inode;
+        root_inode = d_inode(sb->s_root);
 
         return 0;
 }