diff --git a/[refs] b/[refs]
index 17c72ffbd8e0..8b7a4fccc483 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6f1eb97d462a45be3b30759758b5fdbb562c8c
+refs/heads/master: 7f5ff766a7babd72fc192125e12ef5570effff4c
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index f3e5f8944d17..ed53ce876259 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1766,7 +1766,7 @@ int should_remove_suid(struct dentry *dentry)
 	if (unlikely((mode & S_ISGID) && (mode & S_IXGRP)))
 		kill |= ATTR_KILL_SGID;
 
-	if (unlikely(kill && !capable(CAP_FSETID)))
+	if (unlikely(kill && !capable(CAP_FSETID) && S_ISREG(mode)))
 		return kill;
 
 	return 0;