diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-12-20 09:17:35 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-20 09:17:35 +0100 |
| commit | b0f259e9afe0f694f90e800e2534db4703db3d11 (patch) | |
| tree | 7355da06083eb21f3503ce451971fca6a32dfe64 | |
| parent | 10c937604b9d7752fe2e4ef9125da3865a36b229 (diff) | |
| parent | 3603b8eaccc8e41d3f355b3cadd662a3dd6699fd (diff) | |
| download | blackbird-op-linux-b0f259e9afe0f694f90e800e2534db4703db3d11.tar.gz blackbird-op-linux-b0f259e9afe0f694f90e800e2534db4703db3d11.zip | |
Merge branch 'for-2.6.38/core' into for-next
| -rw-r--r-- | drivers/block/loop.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 1 |
2 files changed, 1 insertions, 2 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, struct loop_device *lo = p->lo; struct page *page = buf->page; sector_t IV; - int size, ret; + int size; IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) + (buf->offset >> 9); diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index c6e08661adee..106ed482f119 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -845,7 +845,6 @@ nfsd_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, struct page **pp = rqstp->rq_respages + rqstp->rq_resused; struct page *page = buf->page; size_t size; - int ret; size = sd->len; |
