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 /drivers/block/loop.c | |
| parent | e4ea0c16a85d221ebcc3a21f32e321440459e0fc (diff) | |
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 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 7ea0bea2f7e..c87b0840d2c 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -397,10 +397,6 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, sector_t IV; int size, ret; - ret = buf->ops->confirm(pipe, buf); - if (unlikely(ret)) - return ret; - IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) + (buf->offset >> 9); size = sd->len; |