projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
ceph
/
file.c
diff --git
a/fs/ceph/file.c
b/fs/ceph/file.c
index faf92095e105650617d8e465e898f8d22a803d60..8b79d87eaf4675ff91cf05c10a3fc53e70d5b313 100644
(file)
--- a/
fs/ceph/file.c
+++ b/
fs/ceph/file.c
@@
-962,7
+962,7
@@
static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
pos = iocb->ki_pos;
count = iov_iter_count(from);
- err = file_remove_
suid
(file);
+ err = file_remove_
privs
(file);
if (err)
goto out;