new helper: file_inode(file)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

3 files changed, 7 insertions, 7 deletions

diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 60f0c76a27d3..859abdaac1ea 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -349,8 +349,8 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
         unsigned int state;
         struct file_perms perms = {};
         struct path_cond cond = {
-                bprm->file->f_path.dentry->d_inode->i_uid,
-                bprm->file->f_path.dentry->d_inode->i_mode
+                file_inode(bprm->file)->i_uid,
+                file_inode(bprm->file)->i_mode
         };
         const char *name = NULL, *target = NULL, *info = NULL;
         int error = cap_bprm_set_creds(bprm);
diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index cd21ec5b90af..fdaa50cb1876 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -449,8 +449,8 @@ int aa_file_perm(int op, struct aa_profile *profile, struct file *file,
                  u32 request)
 {
         struct path_cond cond = {
-                .uid = file->f_path.dentry->d_inode->i_uid,
-                .mode = file->f_path.dentry->d_inode->i_mode
+                .uid = file_inode(file)->i_uid,
+                .mode = file_inode(file)->i_mode
         };
 
         return aa_path_perm(op, profile, &file->f_path, PATH_DELEGATE_DELETED,
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 8c2a7f6b35e2..b21830eced41 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -379,7 +379,7 @@ static int apparmor_file_open(struct file *file, const struct cred *cred)
         struct aa_profile *profile;
         int error = 0;
 
-        if (!mediated_filesystem(file->f_path.dentry->d_inode))
+        if (!mediated_filesystem(file_inode(file)))
                 return 0;
 
         /* If in exec, permission is handled by bprm hooks.
@@ -394,7 +394,7 @@ static int apparmor_file_open(struct file *file, const struct cred *cred)
 
         profile = aa_cred_profile(cred);
         if (!unconfined(profile)) {
-                struct inode *inode = file->f_path.dentry->d_inode;
+                struct inode *inode = file_inode(file);
                 struct path_cond cond = { inode->i_uid, inode->i_mode };
 
                 error = aa_path_perm(OP_OPEN, profile, &file->f_path, 0,
@@ -432,7 +432,7 @@ static int common_file_perm(int op, struct file *file, u32 mask)
         BUG_ON(!fprofile);
 
         if (!file->f_path.mnt ||
-            !mediated_filesystem(file->f_path.dentry->d_inode))
+            !mediated_filesystem(file_inode(file)))
                 return 0;
 
         profile = __aa_current_profile();