2 files changed, 3 insertions, 3 deletions

diff --git a/security/inode.c b/security/inode.c
index 8e7ca62078ab..131a3c49f766 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -203,7 +203,7 @@ void securityfs_remove(struct dentry *dentry)
         mutex_lock(&parent->d_inode->i_mutex);
         if (positive(dentry)) {
                 if (dentry->d_inode) {
-                        if (S_ISDIR(dentry->d_inode->i_mode))
+                        if (d_is_dir(dentry))
                                 simple_rmdir(parent->d_inode, dentry);
                         else
                                 simple_unlink(parent->d_inode, dentry);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 79f2c2cb68ad..4d1a54190388 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1799,7 +1799,7 @@ static inline int may_rename(struct inode *old_dir,
 
         old_dsec = old_dir->i_security;
         old_isec = old_dentry->d_inode->i_security;
-        old_is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
+        old_is_dir = d_is_dir(old_dentry);
         new_dsec = new_dir->i_security;
 
         ad.type = LSM_AUDIT_DATA_DENTRY;
@@ -1829,7 +1829,7 @@ static inline int may_rename(struct inode *old_dir,
                 return rc;
         if (d_is_positive(new_dentry)) {
                 new_isec = new_dentry->d_inode->i_security;
-                new_is_dir = S_ISDIR(new_dentry->d_inode->i_mode);
+                new_is_dir = d_is_dir(new_dentry);
                 rc = avc_has_perm(sid, new_isec->sid,
                                   new_isec->sclass,
                                   (new_is_dir ? DIR__RMDIR : FILE__UNLINK), &ad);