diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-06-24 10:50:14 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:16 -0400 |
commit | 2f1936b87783a3a56c9441b27b9ba7a747f11e8e (patch) | |
tree | 024a0f3da74ba6365f209d03685133760146149b /fs/splice.c | |
parent | c82e42da8a6b2f3a85dc4d4278cb8238702f8f64 (diff) |
[patch 3/5] vfs: change remove_suid() to file_remove_suid()
All calls to remove_suid() are made with a file pointer, because
(similarly to file_update_time) it is called when the file is written.
Clean up callers by passing in a file instead of a dentry.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/splice.c')
-rw-r--r-- | fs/splice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index 47dc1a445d1f..b30311ba8af6 100644 --- a/fs/splice.c +++ b/fs/splice.c | |||
@@ -772,7 +772,7 @@ generic_file_splice_write_nolock(struct pipe_inode_info *pipe, struct file *out, | |||
772 | ssize_t ret; | 772 | ssize_t ret; |
773 | int err; | 773 | int err; |
774 | 774 | ||
775 | err = remove_suid(out->f_path.dentry); | 775 | err = file_remove_suid(out); |
776 | if (unlikely(err)) | 776 | if (unlikely(err)) |
777 | return err; | 777 | return err; |
778 | 778 | ||
@@ -830,7 +830,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, | |||
830 | ssize_t ret; | 830 | ssize_t ret; |
831 | 831 | ||
832 | inode_double_lock(inode, pipe->inode); | 832 | inode_double_lock(inode, pipe->inode); |
833 | ret = remove_suid(out->f_path.dentry); | 833 | ret = file_remove_suid(out); |
834 | if (likely(!ret)) | 834 | if (likely(!ret)) |
835 | ret = __splice_from_pipe(pipe, &sd, pipe_to_file); | 835 | ret = __splice_from_pipe(pipe, &sd, pipe_to_file); |
836 | inode_double_unlock(inode, pipe->inode); | 836 | inode_double_unlock(inode, pipe->inode); |