From: Árni Dagur <arni@xxxxxxxx>
Create a public function do_vmsplice(), so that other parts of the
kernel can use it.
Signed-off-by: Árni Dagur <arni@xxxxxxxx>
---
fs/splice.c | 21 +++++++++++++++------
include/linux/splice.h | 2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/fs/splice.c b/fs/splice.c
index 866d5c2367b2..2d653a20cced 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1270,6 +1270,20 @@ static int vmsplice_type(struct fd f, int *type)
return 0;
}
+long do_vmsplice(struct file *file, struct iov_iter *iter, unsigned int flags)
+{
+ long error;
+
+ if (!iov_iter_count(iter))
+ error = 0;
+ else if (iov_iter_rw(iter) == WRITE)
+ error = vmsplice_to_pipe(file, iter, flags);
+ else
+ error = vmsplice_to_user(file, iter, flags);
+
+ return error;
+}
+
/*
* Note that vmsplice only really supports true splicing _from_ user memory
* to a pipe, not the other way around. Splicing from user memory is a simple
@@ -1309,12 +1323,7 @@ SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov,
if (error < 0)
goto out_fdput;
- if (!iov_iter_count(&iter))
- error = 0;
- else if (iov_iter_rw(&iter) == WRITE)
- error = vmsplice_to_pipe(f.file, &iter, flags);
- else
- error = vmsplice_to_user(f.file, &iter, flags);
+ error = do_vmsplice(f.file, &iter, flags);
kfree(iov);
out_fdput:
diff --git a/include/linux/splice.h b/include/linux/splice.h
index a55179fd60fc..44c0e612f652 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -81,9 +81,9 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
extern long do_splice(struct file *in, loff_t *off_in,
struct file *out, loff_t *off_out,
size_t len, unsigned int flags);
-
extern long do_tee(struct file *in, struct file *out, size_t len,
unsigned int flags);
+extern long do_vmsplice(struct file *file, struct iov_iter *iter, unsigned int flags);
/*
* for dynamic pipe sizing
--
2.30.0
