aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-12-17 03:00:46 -0500
committerJens Axboe <jaxboe@fusionio.com>2010-12-17 03:00:46 -0500
commit10c937604b9d7752fe2e4ef9125da3865a36b229 (patch)
treec983b35e8599c53339cca96622c723bb7f0d9b50 /drivers
parentf3c1e66f79f6a19951da10035c46faccc536ad59 (diff)
parente61eb2e93fe86931d46831752a82dab25a5335ca (diff)
Merge branch 'for-2.6.38/core' into for-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/loop.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 7ea0bea2f7e3..c87b0840d2cb 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,
397 sector_t IV; 397 sector_t IV;
398 int size, ret; 398 int size, ret;
399 399
400 ret = buf->ops->confirm(pipe, buf);
401 if (unlikely(ret))
402 return ret;
403
404 IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) + 400 IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +
405 (buf->offset >> 9); 401 (buf->offset >> 9);
406 size = sd->len; 402 size = sd->len;