summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorJan Kara2015-05-21 16:05:53 +0200
committerAl Viro2015-06-24 00:01:08 +0200
commit5fa8e0a1c6a762857ae67d1628c58b9a02362003 (patch)
tree53072ae36f38d4b3c1c56defff4b98acb274c077 /fs/btrfs/file.c
parentfs: Fix S_NOSEC handling (diff)
downloadkernel-qcow2-linux-5fa8e0a1c6a762857ae67d1628c58b9a02362003.tar.gz
kernel-qcow2-linux-5fa8e0a1c6a762857ae67d1628c58b9a02362003.tar.xz
kernel-qcow2-linux-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 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index b072e17479aa..86f97282779a 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1748,7 +1748,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
}
current->backing_dev_info = inode_to_bdi(inode);
- err = file_remove_suid(file);
+ err = file_remove_privs(file);
if (err) {
mutex_unlock(&inode->i_mutex);
goto out;