---

yaml --- r: 230600 b: refs/heads/master c: 3603b8e h: refs/heads/master v: v3
git-mirror · Dec 20, 2010 · 96b62b9 · 96b62b9
1 parent 49b7620
commit 96b62b9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e61eb2e93fe86931d46831752a82dab25a5335ca
+refs/heads/master: 3603b8eaccc8e41d3f355b3cadd662a3dd6699fd
diff --git a/trunk/drivers/block/loop.c b/trunk/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/trunk/fs/nfsd/vfs.c b/trunk/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;