summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-12-20 09:15:19 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-12-20 09:15:19 +0100
commit3603b8eaccc8e41d3f355b3cadd662a3dd6699fd (patch)
tree7aaf66e8b6dceddd96ade80e451f09982fb2c977
parente61eb2e93fe86931d46831752a82dab25a5335ca (diff)
Fix compile warnings due to missing removal of a 'ret' variable
Commit a8adbe3 forgot to remove the return variable, kill it. drivers/block/loop.c: In function 'lo_splice_actor': drivers/block/loop.c:398: warning: unused variable 'ret' [...] fs/nfsd/vfs.c: In function 'nfsd_splice_actor': fs/nfsd/vfs.c:848: warning: unused variable 'ret' Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--drivers/block/loop.c2
-rw-r--r--fs/nfsd/vfs.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c87b0840d2c..44e18c073c4 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 c6e08661ade..106ed482f11 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;