Commit 1676effc authored by Andi Kleen's avatar Andi Kleen Committed by Jens Axboe
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 2c8919de

fs/splice.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ extern int audit_signals; 
#define audit_putname(n) do { ; } while (0)

#define __audit_inode(n,d) do { ; } while (0)

#define __audit_inode_child(i,p) do { ; } while (0)

#define audit_inode(n,d) do { ; } while (0)

#define audit_inode(n,d) do { (void)(d); } while (0)

#define audit_inode_child(i,p) do { ; } while (0)

#define audit_core_dumps(i) do { ; } while (0)

#define auditsc_get_stamp(c,t,s) (0)