preadv/pwritev: create compat_writev()
Factor out some code from compat_sys_writev() which can be shared with the upcoming compat_sys_pwritev(). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: <linux-api@vger.kernel.org> Cc: <linux-arch@vger.kernel.org> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
dac1213842
commit
6949a6318e
1 changed files with 18 additions and 7 deletions
25
fs/compat.c
25
fs/compat.c
|
@ -1232,15 +1232,12 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,
|
|||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage ssize_t
|
||||
compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsigned long vlen)
|
||||
static size_t compat_writev(struct file *file,
|
||||
const struct compat_iovec __user *vec,
|
||||
unsigned long vlen, loff_t *pos)
|
||||
{
|
||||
struct file *file;
|
||||
ssize_t ret = -EBADF;
|
||||
|
||||
file = fget(fd);
|
||||
if (!file)
|
||||
return -EBADF;
|
||||
if (!(file->f_mode & FMODE_WRITE))
|
||||
goto out;
|
||||
|
||||
|
@ -1248,12 +1245,26 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsig
|
|||
if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
|
||||
goto out;
|
||||
|
||||
ret = compat_do_readv_writev(WRITE, file, vec, vlen, &file->f_pos);
|
||||
ret = compat_do_readv_writev(WRITE, file, vec, vlen, pos);
|
||||
|
||||
out:
|
||||
if (ret > 0)
|
||||
add_wchar(current, ret);
|
||||
inc_syscw(current);
|
||||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage ssize_t
|
||||
compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,
|
||||
unsigned long vlen)
|
||||
{
|
||||
struct file *file;
|
||||
ssize_t ret;
|
||||
|
||||
file = fget(fd);
|
||||
if (!file)
|
||||
return -EBADF;
|
||||
ret = compat_writev(file, vec, vlen, &file->f_pos);
|
||||
fput(file);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue