From f22874faac938d9732c824540a2752900553c571 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Mon, 20 Dec 2010 09:17:35 +0100
Subject: [PATCH] --- yaml --- r: 231549 b: refs/heads/master c:
 b0f259e9afe0f694f90e800e2534db4703db3d11 h: refs/heads/master i:   231547:
 adeb0117bda79cd39926a0d5bb990be0df24f8a0 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/loop.c | 2 +-
 trunk/fs/nfsd/vfs.c        | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7373d3ff76fb..8c6bf19f7190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10c937604b9d7752fe2e4ef9125da3865a36b229
+refs/heads/master: b0f259e9afe0f694f90e800e2534db4703db3d11
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
index c87b0840d2cb..44e18c073c44 100644
--- 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
index c6e08661adee..106ed482f119 100644
--- 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;