diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2010-12-17 08:56:44 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-17 08:56:44 +0100 |
| commit | a8adbe378b56acd5945df70753c7e8f6fe223304 (patch) | |
| tree | afbaae1cb71be95f342f6638bfe2d3f1e22dd9a4 /fs/nfsd | |
| parent | block cfq: select new workload if priority changed (diff) | |
| download | linux-a8adbe378b56acd5945df70753c7e8f6fe223304.tar.xz linux-a8adbe378b56acd5945df70753c7e8f6fe223304.zip | |
fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
This patch pulls calls to buf->ops->confirm() from all actors passed
(also indirectly) to splice_from_pipe_feed().
Is avoiding the call to buf->ops->confirm() while splice()ing to
/dev/null is an intentional optimization? No other user does that
and this will remove this special case.
Against current linux.git 6313e3c21743cc88bb5bd8aa72948ee1e83937b6.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 184938fcff04..c6e08661adee 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -847,10 +847,6 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, size_t size; int ret; - ret = buf->ops->confirm(pipe, buf); - if (unlikely(ret)) - return ret; - size = sd->len; if (rqstp->rq_res.page_len == 0) { |