fs: move kernel_write to fs/read_write.c
Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
317d5a5f0f
commit
ac452acae1
|
@ -496,9 +496,24 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
|
||||||
inc_syscw(current);
|
inc_syscw(current);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(__kernel_write);
|
EXPORT_SYMBOL(__kernel_write);
|
||||||
|
|
||||||
|
ssize_t kernel_write(struct file *file, const char *buf, size_t count,
|
||||||
|
loff_t pos)
|
||||||
|
{
|
||||||
|
mm_segment_t old_fs;
|
||||||
|
ssize_t res;
|
||||||
|
|
||||||
|
old_fs = get_fs();
|
||||||
|
set_fs(get_ds());
|
||||||
|
/* The cast to a user pointer is valid due to the set_fs() */
|
||||||
|
res = vfs_write(file, (__force const char __user *)buf, count, &pos);
|
||||||
|
set_fs(old_fs);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(kernel_write);
|
||||||
|
|
||||||
ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
|
ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_t *pos)
|
||||||
{
|
{
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
|
|
16
fs/splice.c
16
fs/splice.c
|
@ -364,22 +364,6 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t kernel_write(struct file *file, const char *buf, size_t count,
|
|
||||||
loff_t pos)
|
|
||||||
{
|
|
||||||
mm_segment_t old_fs;
|
|
||||||
ssize_t res;
|
|
||||||
|
|
||||||
old_fs = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
/* The cast to a user pointer is valid due to the set_fs() */
|
|
||||||
res = vfs_write(file, (__force const char __user *)buf, count, &pos);
|
|
||||||
set_fs(old_fs);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(kernel_write);
|
|
||||||
|
|
||||||
static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
|
static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
|
||||||
struct pipe_inode_info *pipe, size_t len,
|
struct pipe_inode_info *pipe, size_t len,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
|
|
Loading…
Reference in New Issue