diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-20 03:17:35 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-20 03:17:35 -0500 |
| commit | b0f259e9afe0f694f90e800e2534db4703db3d11 (patch) | |
| tree | 7355da06083eb21f3503ce451971fca6a32dfe64 /drivers | |
| parent | 10c937604b9d7752fe2e4ef9125da3865a36b229 (diff) | |
| parent | 3603b8eaccc8e41d3f355b3cadd662a3dd6699fd (diff) | |
Merge branch 'for-2.6.38/core' into for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index c87b0840d2cb..44e18c073c44 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -395,7 +395,7 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, | |||
| 395 | struct loop_device *lo = p->lo; | 395 | struct loop_device *lo = p->lo; |
| 396 | struct page *page = buf->page; | 396 | struct page *page = buf->page; |
| 397 | sector_t IV; | 397 | sector_t IV; |
| 398 | int size, ret; | 398 | int size; |
| 399 | 399 | ||
| 400 | IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) + | 400 | IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) + |
| 401 | (buf->offset >> 9); | 401 | (buf->offset >> 9); |