summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 18:36:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 18:36:59 -0700
commit8397345172aa5cdcbc133977af9d525f45b874ea (patch)
tree9b1077a62bbe06d20f1e49d1aa842db0435be085 /mm
parent59c5f46fbe01a00eedf54a23789634438bb80603 (diff)
parente6bc45d65df8599fdbae73be9cec4ceed274db53 (diff)
downloadop-kernel-dev-8397345172aa5cdcbc133977af9d525f45b874ea.zip
op-kernel-dev-8397345172aa5cdcbc133977af9d525f45b874ea.tar.gz
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: vfs: make unlink() and rmdir() return ENOENT in preference to EROFS lmLogOpen() broken failure exit usb: remove bad dput after dentry_unhash more conservative S_NOSEC handling
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index d7b1057..a8251a8 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2000,7 +2000,7 @@ int file_remove_suid(struct file *file)
error = security_inode_killpriv(dentry);
if (!error && killsuid)
error = __remove_suid(dentry, killsuid);
- if (!error)
+ if (!error && (inode->i_sb->s_flags & MS_NOSEC))
inode->i_flags |= S_NOSEC;
return error;
OpenPOWER on IntegriCloud