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

Commit 31b1a2bd authored by Julia Lawall's avatar Julia Lawall Committed by Josef Bacik
Browse files

fs/btrfs: use WARN 

Use WARN rather than printk followed by WARN_ON(1), for conciseness.

A simplified version of the semantic patch that makes this transformation
is as follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression list es;
@@

-printk(
+WARN(1,
  es);
-WARN_ON(1);
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 5269b67e

fs/btrfs/ctree.c

+7 −12
Original line number Diff line number Diff line
@@ -1359,19 +1359,16 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 
	u64 search_start;

	int ret;



	if (trans->transaction != root->fs_info->running_transaction) {

		printk(KERN_CRIT "trans %llu running %llu\n",

	if (trans->transaction != root->fs_info->running_transaction)

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		       (unsigned long long)trans->transid,

		       (unsigned long long)

		       root->fs_info->running_transaction->transid);

		WARN_ON(1);

	}

	if (trans->transid != root->fs_info->generation) {

		printk(KERN_CRIT "trans %llu running %llu\n",



	if (trans->transid != root->fs_info->generation)

		WARN(1, KERN_CRIT "trans %llu running %llu\n",

		       (unsigned long long)trans->transid,

		       (unsigned long long)root->fs_info->generation);

		WARN_ON(1);

	}



	if (!should_cow_block(trans, root, buf)) {

		*cow_ret = buf;
@@ -3640,11 +3637,9 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, 
	btrfs_set_header_nritems(left, old_left_nritems + push_items);



	/* fixup right node */

	if (push_items > right_nritems) {

		printk(KERN_CRIT "push items %d nr %u\n", push_items,

	if (push_items > right_nritems)

		WARN(1, KERN_CRIT "push items %d nr %u\n", push_items,

		       right_nritems);

		WARN_ON(1);

	}



	if (push_items < right_nritems) {

		push_space = btrfs_item_offset_nr(right, push_items - 1) -

fs/btrfs/disk-io.c

+2 −4
Original line number Diff line number Diff line
@@ -3397,14 +3397,12 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf) 
	int was_dirty;



	btrfs_assert_tree_locked(buf);

	if (transid != root->fs_info->generation) {

		printk(KERN_CRIT "btrfs transid mismatch buffer %llu, "

	if (transid != root->fs_info->generation)

		WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, "

		       "found %llu running %llu\n",

			(unsigned long long)buf->start,

			(unsigned long long)transid,

			(unsigned long long)root->fs_info->generation);

		WARN_ON(1);

	}

	was_dirty = set_extent_buffer_dirty(buf);

	if (!was_dirty) {

		spin_lock(&root->fs_info->delalloc_lock);

fs/btrfs/extent-tree.c

+3 −4
Original line number Diff line number Diff line
@@ -6292,10 +6292,9 @@ use_block_rsv(struct btrfs_trans_handle *trans, 
		static DEFINE_RATELIMIT_STATE(_rs,

				DEFAULT_RATELIMIT_INTERVAL,

				/*DEFAULT_RATELIMIT_BURST*/ 2);

		if (__ratelimit(&_rs)) {

			printk(KERN_DEBUG "btrfs: block rsv returned %d\n", ret);

			WARN_ON(1);

		}

		if (__ratelimit(&_rs))

			WARN(1, KERN_DEBUG "btrfs: block rsv returned %d\n",

			     ret);

		ret = reserve_metadata_bytes(root, block_rsv, blocksize,

					     BTRFS_RESERVE_NO_FLUSH);

		if (!ret) {

fs/btrfs/extent_io.c

+3 −6
Original line number Diff line number Diff line
@@ -341,12 +341,10 @@ static int insert_state(struct extent_io_tree *tree, 
{

	struct rb_node *node;



	if (end < start) {

		printk(KERN_ERR "btrfs end < start %llu %llu\n",

	if (end < start)

		WARN(1, KERN_ERR "btrfs end < start %llu %llu\n",

		       (unsigned long long)end,

		       (unsigned long long)start);

		WARN_ON(1);

	}

	state->start = start;

	state->end = end;
@@ -4721,10 +4719,9 @@ int map_private_extent_buffer(struct extent_buffer *eb, unsigned long start, 
	}



	if (start + min_len > eb->len) {

		printk(KERN_ERR "btrfs bad mapping eb start %llu len %lu, "

		WARN(1, KERN_ERR "btrfs bad mapping eb start %llu len %lu, "

		       "wanted %lu %lu\n", (unsigned long long)eb->start,

		       eb->len, start, min_len);

		WARN_ON(1);

		return -EINVAL;

	}

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -5458,8 +5458,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page, 
				    extent_map_end(em) - 1, NULL, GFP_NOFS);

		goto insert;

	} else {

		printk(KERN_ERR "btrfs unknown found_type %d\n", found_type);

		WARN_ON(1);

		WARN(1, KERN_ERR "btrfs unknown found_type %d\n", found_type);

	}

not_found:

	em->start = start;