VFS: security/: d_backing_inode() annotations

most of the ->d_inode uses there refer to the same inode IO would
go to, i.e. d_backing_inode()

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

2 files changed, 12 insertions, 12 deletions

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index fdaa50cb1876..913f377a038a 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -259,7 +259,7 @@ unsigned int aa_str_perms(struct aa_dfa *dfa, unsigned int start,
  */
 static inline bool is_deleted(struct dentry *dentry)
 {
-        if (d_unlinked(dentry) && dentry->d_inode->i_nlink == 0)
+        if (d_unlinked(dentry) && d_backing_inode(dentry)->i_nlink == 0)
                 return 1;
         return 0;
 }
@@ -351,8 +351,8 @@ int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
         struct path link = { new_dir->mnt, new_dentry };
         struct path target = { new_dir->mnt, old_dentry };
         struct path_cond cond = {
-                old_dentry->d_inode->i_uid,
-                old_dentry->d_inode->i_mode
+                d_backing_inode(old_dentry)->i_uid,
+                d_backing_inode(old_dentry)->i_mode
         };
         char *buffer = NULL, *buffer2 = NULL;
         const char *lname, *tname = NULL, *info = NULL;
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index dd56bffd6500..e5f1561439db 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -204,8 +204,8 @@ static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
                                   struct dentry *dentry, u32 mask)
 {
         struct path path = { mnt, dentry };
-        struct path_cond cond = { dentry->d_inode->i_uid,
-                                  dentry->d_inode->i_mode
+        struct path_cond cond = { d_backing_inode(dentry)->i_uid,
+                                  d_backing_inode(dentry)->i_mode
         };
 
         return common_perm(op, &path, mask, &cond);
@@ -223,7 +223,7 @@ static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
 static int common_perm_rm(int op, struct path *dir,
                           struct dentry *dentry, u32 mask)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_backing_inode(dentry);
         struct path_cond cond = { };
 
         if (!inode || !dir->mnt || !mediated_filesystem(dentry))
@@ -281,8 +281,8 @@ static int apparmor_path_mknod(struct path *dir, struct dentry *dentry,
 
 static int apparmor_path_truncate(struct path *path)
 {
-        struct path_cond cond = { path->dentry->d_inode->i_uid,
-                                  path->dentry->d_inode->i_mode
+        struct path_cond cond = { d_backing_inode(path->dentry)->i_uid,
+                                  d_backing_inode(path->dentry)->i_mode
         };
 
         if (!path->mnt || !mediated_filesystem(path->dentry))
@@ -327,8 +327,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
         if (!unconfined(profile)) {
                 struct path old_path = { old_dir->mnt, old_dentry };
                 struct path new_path = { new_dir->mnt, new_dentry };
-                struct path_cond cond = { old_dentry->d_inode->i_uid,
-                                          old_dentry->d_inode->i_mode
+                struct path_cond cond = { d_backing_inode(old_dentry)->i_uid,
+                                          d_backing_inode(old_dentry)->i_mode
                 };
 
                 error = aa_path_perm(OP_RENAME_SRC, profile, &old_path, 0,
@@ -354,8 +354,8 @@ static int apparmor_path_chmod(struct path *path, umode_t mode)
 
 static int apparmor_path_chown(struct path *path, kuid_t uid, kgid_t gid)
 {
-        struct path_cond cond =  { path->dentry->d_inode->i_uid,
-                                   path->dentry->d_inode->i_mode
+        struct path_cond cond =  { d_backing_inode(path->dentry)->i_uid,
+                                   d_backing_inode(path->dentry)->i_mode
         };
 
         if (!mediated_filesystem(path->dentry))