Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 559af821 authored by Andi Kleen's avatar Andi Kleen Committed by Chris Mason
Browse files

Btrfs: cleanup warnings from gcc 4.6 (nonbugs) 



These are all the cases where a variable is set, but not read which are
not bugs as far as I can see, but simply leftovers.

Still needs more review.

Found by gcc 4.6's new warnings

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 411fc6bc

fs/btrfs/compression.c

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ static int check_compressed_csum(struct inode *inode, 
 */

static void end_compressed_bio_read(struct bio *bio, int err)

{

	struct extent_io_tree *tree;

	struct compressed_bio *cb = bio->bi_private;

	struct inode *inode;

	struct page *page;
@@ -187,7 +186,6 @@ static void end_compressed_bio_read(struct bio *bio, int err) 
	/* ok, we're the last bio for this extent, lets start

	 * the decompression.

	 */

	tree = &BTRFS_I(inode)->io_tree;

	ret = btrfs_zlib_decompress_biovec(cb->compressed_pages,

					cb->start,

					cb->orig_bio->bi_io_vec,

fs/btrfs/ctree.c

+2 −18
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 
		      struct extent_buffer **cow_ret, u64 new_root_objectid)

{

	struct extent_buffer *cow;

	u32 nritems;

	int ret = 0;

	int level;

	struct btrfs_disk_key disk_key;
@@ -210,7 +209,6 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 
	WARN_ON(root->ref_cows && trans->transid != root->last_trans);



	level = btrfs_header_level(buf);

	nritems = btrfs_header_nritems(buf);

	if (level == 0)

		btrfs_item_key(buf, &disk_key, 0);

	else
@@ -1008,7 +1006,6 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
	int wret;

	int pslot;

	int orig_slot = path->slots[level];

	int err_on_enospc = 0;

	u64 orig_ptr;



	if (level == 0)
@@ -1071,8 +1068,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
	    BTRFS_NODEPTRS_PER_BLOCK(root) / 4)

		return 0;



	if (btrfs_header_nritems(mid) < 2)

		err_on_enospc = 1;

	btrfs_header_nritems(mid);



	left = read_node_slot(root, parent, pslot - 1);

	if (left) {
@@ -1103,8 +1099,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		wret = push_node_left(trans, root, left, mid, 1);

		if (wret < 0)

			ret = wret;

		if (btrfs_header_nritems(mid) < 2)

			err_on_enospc = 1;

		btrfs_header_nritems(mid);

	}



	/*
@@ -1224,14 +1219,12 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans, 
	int wret;

	int pslot;

	int orig_slot = path->slots[level];

	u64 orig_ptr;



	if (level == 0)

		return 1;



	mid = path->nodes[level];

	WARN_ON(btrfs_header_generation(mid) != trans->transid);

	orig_ptr = btrfs_node_blockptr(mid, orig_slot);



	if (level < BTRFS_MAX_LEVEL - 1)

		parent = path->nodes[level + 1];
@@ -2567,7 +2560,6 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, 
{

	struct btrfs_disk_key disk_key;

	struct extent_buffer *right = path->nodes[0];

	int slot;

	int i;

	int push_space = 0;

	int push_items = 0;
@@ -2579,8 +2571,6 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, 
	u32 this_item_size;

	u32 old_left_item_size;



	slot = path->slots[1];



	if (empty)

		nr = min(right_nritems, max_slot);

	else
@@ -3349,7 +3339,6 @@ int btrfs_truncate_item(struct btrfs_trans_handle *trans, 
{

	int ret = 0;

	int slot;

	int slot_orig;

	struct extent_buffer *leaf;

	struct btrfs_item *item;

	u32 nritems;
@@ -3359,7 +3348,6 @@ int btrfs_truncate_item(struct btrfs_trans_handle *trans, 
	unsigned int size_diff;

	int i;



	slot_orig = path->slots[0];

	leaf = path->nodes[0];

	slot = path->slots[0];
@@ -3464,7 +3452,6 @@ int btrfs_extend_item(struct btrfs_trans_handle *trans, 
{

	int ret = 0;

	int slot;

	int slot_orig;

	struct extent_buffer *leaf;

	struct btrfs_item *item;

	u32 nritems;
@@ -3473,7 +3460,6 @@ int btrfs_extend_item(struct btrfs_trans_handle *trans, 
	unsigned int old_size;

	int i;



	slot_orig = path->slots[0];

	leaf = path->nodes[0];



	nritems = btrfs_header_nritems(leaf);
@@ -3806,7 +3792,6 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans, 
			    struct btrfs_key *cpu_key, u32 *data_size,

			    int nr)

{

	struct extent_buffer *leaf;

	int ret = 0;

	int slot;

	int i;
@@ -3823,7 +3808,6 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans, 
	if (ret < 0)

		goto out;



	leaf = path->nodes[0];

	slot = path->slots[0];

	BUG_ON(slot < 0);

fs/btrfs/disk-io.c

+0 −11
Original line number Diff line number Diff line
@@ -338,7 +338,6 @@ static int csum_dirty_buffer(struct btrfs_root *root, struct page *page) 
	struct extent_io_tree *tree;

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 found_start;

	int found_level;

	unsigned long len;

	struct extent_buffer *eb;

	int ret;
@@ -369,8 +368,6 @@ static int csum_dirty_buffer(struct btrfs_root *root, struct page *page) 
		WARN_ON(1);

		goto err;

	}

	found_level = btrfs_header_level(eb);



	csum_tree_block(root, eb, 0);

err:

	free_extent_buffer(eb);
@@ -543,11 +540,9 @@ int btrfs_congested_async(struct btrfs_fs_info *info, int iodone) 


static void run_one_async_start(struct btrfs_work *work)

{

	struct btrfs_fs_info *fs_info;

	struct async_submit_bio *async;



	async = container_of(work, struct  async_submit_bio, work);

	fs_info = BTRFS_I(async->inode)->root->fs_info;

	async->submit_bio_start(async->inode, async->rw, async->bio,

			       async->mirror_num, async->bio_flags,

			       async->bio_offset);
@@ -860,12 +855,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, 
				      u32 blocksize, u64 parent_transid)

{

	struct extent_buffer *buf = NULL;

	struct inode *btree_inode = root->fs_info->btree_inode;

	struct extent_io_tree *io_tree;

	int ret;



	io_tree = &BTRFS_I(btree_inode)->io_tree;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	if (!buf)

		return NULL;
@@ -1387,7 +1378,6 @@ static int bio_ready_for_csum(struct bio *bio) 
	u64 start = 0;

	struct page *page;

	struct extent_io_tree *io_tree = NULL;

	struct btrfs_fs_info *info = NULL;

	struct bio_vec *bvec;

	int i;

	int ret;
@@ -1406,7 +1396,6 @@ static int bio_ready_for_csum(struct bio *bio) 
		buf_len = page->private >> 2;

		start = page_offset(page) + bvec->bv_offset;

		io_tree = &BTRFS_I(page->mapping->host)->io_tree;

		info = BTRFS_I(page->mapping->host)->root->fs_info;

	}

	/* are we fully contained in this bio? */

	if (buf_len <= length)

fs/btrfs/extent-tree.c

+0 −2
Original line number Diff line number Diff line
@@ -5719,7 +5719,6 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, 
	u64 generation;

	u64 refs;

	u64 flags;

	u64 last = 0;

	u32 nritems;

	u32 blocksize;

	struct btrfs_key key;
@@ -5787,7 +5786,6 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, 
					   generation);

		if (ret)

			break;

		last = bytenr + blocksize;

		nread++;

	}

	wc->reada_slot = slot;

fs/btrfs/extent_io.c

+0 −9
Original line number Diff line number Diff line
@@ -1857,10 +1857,8 @@ static int submit_one_bio(int rw, struct bio *bio, int mirror_num, 
	struct page *page = bvec->bv_page;

	struct extent_io_tree *tree = bio->bi_private;

	u64 start;

	u64 end;



	start = ((u64)page->index << PAGE_CACHE_SHIFT) + bvec->bv_offset;

	end = start + bvec->bv_len - 1;



	bio->bi_private = NULL;
@@ -2160,7 +2158,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 
	u64 last_byte = i_size_read(inode);

	u64 block_start;

	u64 iosize;

	u64 unlock_start;

	sector_t sector;

	struct extent_state *cached_state = NULL;

	struct extent_map *em;
@@ -2285,7 +2282,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 
		if (tree->ops && tree->ops->writepage_end_io_hook)

			tree->ops->writepage_end_io_hook(page, start,

							 page_end, NULL, 1);

		unlock_start = page_end + 1;

		goto done;

	}
@@ -2296,7 +2292,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 
			if (tree->ops && tree->ops->writepage_end_io_hook)

				tree->ops->writepage_end_io_hook(page, cur,

							 page_end, NULL, 1);

			unlock_start = page_end + 1;

			break;

		}

		em = epd->get_extent(inode, page, pg_offset, cur,
@@ -2343,7 +2338,6 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 


			cur += iosize;

			pg_offset += iosize;

			unlock_start = cur;

			continue;

		}

		/* leave this out until we have a page_mkwrite call */
@@ -2429,7 +2423,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree, 
	pgoff_t index;

	pgoff_t end;		/* Inclusive */

	int scanned = 0;

	int range_whole = 0;



	pagevec_init(&pvec, 0);

	if (wbc->range_cyclic) {
@@ -2438,8 +2431,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree, 
	} else {

		index = wbc->range_start >> PAGE_CACHE_SHIFT;

		end = wbc->range_end >> PAGE_CACHE_SHIFT;

		if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)

			range_whole = 1;

		scanned = 1;

	}

retry: