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

Commit fae7f21c authored by Dulshani Gunawardhana's avatar Dulshani Gunawardhana Committed by Chris Mason
Browse files

btrfs: Use WARN_ON()'s return value in place of WARN_ON(1) 



Use WARN_ON()'s return value in place of WARN_ON(1) for cleaner source
code that outputs a more descriptive warnings. Also fix the styling
warning of redundant braces that came up as a result of this fix.

Signed-off-by: default avatarDulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: default avatarZach Brown <zab@redhat.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent b19e6843

fs/btrfs/backref.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -326,8 +326,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 




	eb = path->nodes[level];

	eb = path->nodes[level];

	while (!eb) {

	while (!eb) {

		if (!level) {

		if (WARN_ON(!level)) {

			WARN_ON(1);

			ret = 1;

			ret = 1;

			goto out;

			goto out;

		}

		}

fs/btrfs/check-integrity.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -2464,10 +2464,8 @@ static int btrfsic_process_written_superblock( 
		}

		}

	}

	}





	if (-1 == btrfsic_check_all_ref_blocks(state, superblock, 0)) {

	if (WARN_ON(-1 == btrfsic_check_all_ref_blocks(state, superblock, 0)))

		WARN_ON(1);

		btrfsic_dump_tree(state);

		btrfsic_dump_tree(state);

	}





	return 0;

	return 0;

}

}
@@ -2907,7 +2905,7 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state, 
		btrfsic_release_block_ctx(&block_ctx);

		btrfsic_release_block_ctx(&block_ctx);

	}

	}





	if (!match) {

	if (WARN_ON(!match)) {

		printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio,"

		printk(KERN_INFO "btrfs: attempt to write M-block which contains logical bytenr that doesn't map to dev+physical bytenr of submit_bio,"

		       " buffer->log_bytenr=%llu, submit_bio(bdev=%s,"

		       " buffer->log_bytenr=%llu, submit_bio(bdev=%s,"

		       " phys_bytenr=%llu)!\n",

		       " phys_bytenr=%llu)!\n",
@@ -2924,7 +2922,6 @@ static void btrfsic_cmp_log_and_dev_bytenr(struct btrfsic_state *state, 
			       bytenr, block_ctx.dev->name,

			       bytenr, block_ctx.dev->name,

			       block_ctx.dev_bytenr, mirror_num);

			       block_ctx.dev_bytenr, mirror_num);

		}

		}

		WARN_ON(1);

	}

	}

}

}

fs/btrfs/ctree.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1285,11 +1285,10 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
		free_extent_buffer(eb_root);

		free_extent_buffer(eb_root);

		blocksize = btrfs_level_size(root, old_root->level);

		blocksize = btrfs_level_size(root, old_root->level);

		old = read_tree_block(root, logical, blocksize, 0);

		old = read_tree_block(root, logical, blocksize, 0);

		if (!old || !extent_buffer_uptodate(old)) {

		if (WARN_ON(!old || !extent_buffer_uptodate(old))) {

			free_extent_buffer(old);

			free_extent_buffer(old);

			pr_warn("btrfs: failed to read tree block %llu from get_old_root\n",

			pr_warn("btrfs: failed to read tree block %llu from get_old_root\n",

				logical);

				logical);

			WARN_ON(1);

		} else {

		} else {

			eb = btrfs_clone_extent_buffer(old);

			eb = btrfs_clone_extent_buffer(old);

			free_extent_buffer(old);

			free_extent_buffer(old);
@@ -3643,8 +3642,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, 
		ret = 1;

		ret = 1;

		goto out;

		goto out;

	}

	}

	if (!empty && push_items == btrfs_header_nritems(right))

	WARN_ON(!empty && push_items == btrfs_header_nritems(right));

		WARN_ON(1);





	/* push data from right to left */

	/* push data from right to left */

	copy_extent_buffer(left, right,

	copy_extent_buffer(left, right,

fs/btrfs/delayed-inode.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -649,14 +649,13 @@ static int btrfs_delayed_inode_reserve_metadata( 
			goto out;

			goto out;





		ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes);

		ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes);

		if (!ret)

		if (!WARN_ON(ret))

			goto out;

			goto out;





		/*

		/*

		 * Ok this is a problem, let's just steal from the global rsv

		 * Ok this is a problem, let's just steal from the global rsv

		 * since this really shouldn't happen that often.

		 * since this really shouldn't happen that often.

		 */

		 */

		WARN_ON(1);

		ret = btrfs_block_rsv_migrate(&root->fs_info->global_block_rsv,

		ret = btrfs_block_rsv_migrate(&root->fs_info->global_block_rsv,

					      dst_rsv, num_bytes);

					      dst_rsv, num_bytes);

		goto out;

		goto out;

fs/btrfs/disk-io.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -475,14 +475,8 @@ static int csum_dirty_buffer(struct btrfs_root *root, struct page *page) 
	if (page != eb->pages[0])

	if (page != eb->pages[0])

		return 0;

		return 0;

	found_start = btrfs_header_bytenr(eb);

	found_start = btrfs_header_bytenr(eb);

	if (found_start != start) {

	if (WARN_ON(found_start != start || !PageUptodate(page)))

		WARN_ON(1);

		return 0;

		return 0;

	}

	if (!PageUptodate(page)) {

		WARN_ON(1);

		return 0;

	}

	csum_tree_block(root, eb, 0);

	csum_tree_block(root, eb, 0);

	return 0;

	return 0;

}

}