1 files changed, 5 insertions, 4 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 28d49b301d55..db1bca26d88c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -249,9 +249,11 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
 
         /*
          * MAY_EXEC on regular files requires special handling: We override
-         * filesystem execute permissions if the mode bits aren't set.
+         * filesystem execute permissions if the mode bits aren't set or
+         * the fs is mounted with the "noexec" flag.
          */
-        if ((mask & MAY_EXEC) && S_ISREG(mode) && !(mode & S_IXUGO))
+        if ((mask & MAY_EXEC) && S_ISREG(mode) && (!(mode & S_IXUGO) ||
+                        (nd && nd->mnt && (nd->mnt->mnt_flags & MNT_NOEXEC))))
                 return -EACCES;
 
         /* Ordinary permission routines do not understand MAY_APPEND. */
@@ -1996,8 +1998,7 @@ asmlinkage long sys_mkdir(const char __user *pathname, int mode)
 void dentry_unhash(struct dentry *dentry)
 {
         dget(dentry);
-        if (atomic_read(&dentry->d_count))
-                shrink_dcache_parent(dentry);
+        shrink_dcache_parent(dentry);
         spin_lock(&dcache_lock);
         spin_lock(&dentry->d_lock);
         if (atomic_read(&dentry->d_count) == 2)