summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-06-21 11:02:48 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:23:12 +0200
commit1676effca4cd2a6b32e6e8e0ecaa91522dfda6fa (patch)
tree7d570c366f6d968a74c39406052d6dd0223e4881 /fs/splice.c
parent2c8919dee659928d66cc13333d4e7a5bdd2206d5 (diff)
downloadlinux-stable-1676effca4cd2a6b32e6e8e0ecaa91522dfda6fa.tar.gz
linux-stable-1676effca4cd2a6b32e6e8e0ecaa91522dfda6fa.tar.bz2
linux-stable-1676effca4cd2a6b32e6e8e0ecaa91522dfda6fa.zip
gcc-4.6: fs: fix unused but set warnings
No real bugs I believe, just some dead code, and some shut up code. Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/splice.c')
-rw-r--r--fs/splice.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c
index efdbfece9932..ec11c52d646d 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -597,7 +597,6 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
struct page *pages[PIPE_DEF_BUFFERS];
struct partial_page partial[PIPE_DEF_BUFFERS];
struct iovec *vec, __vec[PIPE_DEF_BUFFERS];
- pgoff_t index;
ssize_t res;
size_t this_len;
int error;
@@ -621,7 +620,6 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
goto shrink_ret;
}
- index = *ppos >> PAGE_CACHE_SHIFT;
offset = *ppos & ~PAGE_CACHE_MASK;
nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;