From: [email protected]
To: [email protected]
Cc: [email protected], "Árni Dagur" <[email protected]>
Subject: [PATCH 1/2] splice: Make vmsplice public
Date: Tue, 05 Jan 2021 23:00:14 GMT [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Árni Dagur <[email protected]>
Create a public function do_vmsplice(), so that other parts of the
kernel can use it.
Signed-off-by: Árni Dagur <[email protected]>
---
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
next prev parent reply other threads:[~2021-01-05 23:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 23:00 [PATCH] io_uring: Add vmsplice support arni
2021-01-05 23:00 ` arni [this message]
2021-01-05 23:00 ` [PATCH 2/2] " arni
2021-01-05 23:43 ` Pavel Begunkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox