Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3603b8ea authored by Jens Axboe's avatar Jens Axboe
Browse files

Fix compile warnings due to missing removal of a 'ret' variable 



Commit a8adbe37 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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent e61eb2e9

drivers/block/loop.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ lo_splice_actor(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
	struct loop_device *lo = p->lo;

	struct loop_device *lo = p->lo;

	struct page *page = buf->page;

	struct page *page = buf->page;

	sector_t IV;

	sector_t IV;

	int size, ret;

	int size;





	IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +

	IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9)) +

							(buf->offset >> 9);

							(buf->offset >> 9);

fs/nfsd/vfs.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 **pp = rqstp->rq_respages + rqstp->rq_resused;

	struct page *page = buf->page;

	struct page *page = buf->page;

	size_t size;

	size_t size;

	int ret;





	size = sd->len;

	size = sd->len;