Merge branch 'for-2.6.38/core' into for-next

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index c87b0840d2cb025f4e385a48e809c92174b9f456..44e18c073c44105d03c1f7e0b9cd9bda229cac0f 100644 (file)
--- 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 c6e08661adee3b6ee3d87cf199106a653e33dc9b..106ed482f11994a42608fa97f831f85f574a5197 100644 (file)
--- 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;