summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-05-21 16:05:53 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-06-23 18:01:08 -0400
commit5fa8e0a1c6a762857ae67d1628c58b9a02362003 (patch)
tree53072ae36f38d4b3c1c56defff4b98acb274c077 /mm
parent2426f3910069ed47c0cc58559a6d088af7920201 (diff)
downloadlinux-stable-5fa8e0a1c6a762857ae67d1628c58b9a02362003.tar.gz
linux-stable-5fa8e0a1c6a762857ae67d1628c58b9a02362003.tar.bz2
linux-stable-5fa8e0a1c6a762857ae67d1628c58b9a02362003.zip
fs: Rename file_remove_suid() to file_remove_privs()
file_remove_suid() is a misnomer since it removes also file capabilities stored in xattrs and sets S_NOSEC flag. Also should_remove_suid() tells something else than whether file_remove_suid() call is necessary which leads to bugs. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 6bf5e42d560a..f851e36802d5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2536,7 +2536,7 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
/* We can write back this queue in page reclaim */
current->backing_dev_info = inode_to_bdi(inode);
- err = file_remove_suid(file);
+ err = file_remove_privs(file);
if (err)
goto out;