diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
| commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
| tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /mm/filemap.c | |
| parent | 583af252ab07cd1e8721878463da5b7016c18fdc (diff) | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index d7b10578a64b..a8251a8d3457 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -2000,7 +2000,7 @@ int file_remove_suid(struct file *file) | |||
| 2000 | error = security_inode_killpriv(dentry); | 2000 | error = security_inode_killpriv(dentry); |
| 2001 | if (!error && killsuid) | 2001 | if (!error && killsuid) |
| 2002 | error = __remove_suid(dentry, killsuid); | 2002 | error = __remove_suid(dentry, killsuid); |
| 2003 | if (!error) | 2003 | if (!error && (inode->i_sb->s_flags & MS_NOSEC)) |
| 2004 | inode->i_flags |= S_NOSEC; | 2004 | inode->i_flags |= S_NOSEC; |
| 2005 | 2005 | ||
| 2006 | return error; | 2006 | return error; |