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: Julia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

7 files changed, 21 insertions, 38 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 100c274a1cfe..0e4adb00e9d9 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -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) -
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 064315990f8a..07a2162cdd65 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b495cb4b9b2b..0bcb9543da60 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -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) {
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 472873a94d96..3c062c8d1d70 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -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;
         }
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 96d20903beeb..6dca345fd1b6 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5458,8 +5458,7 @@ again:
                                     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;
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index bc1f52397334..f21f39f0b1a1 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -145,16 +145,12 @@ loop:
          * the log must never go across transaction boundaries.
          */
         smp_mb();
-        if (!list_empty(&fs_info->tree_mod_seq_list)) {
-                printk(KERN_ERR "btrfs: tree_mod_seq_list not empty when "
+        if (!list_empty(&fs_info->tree_mod_seq_list))
+                WARN(1, KERN_ERR "btrfs: tree_mod_seq_list not empty when "
                         "creating a fresh transaction\n");
-                WARN_ON(1);
-        }
-        if (!RB_EMPTY_ROOT(&fs_info->tree_mod_log)) {
-                printk(KERN_ERR "btrfs: tree_mod_log rb tree not empty when "
+        if (!RB_EMPTY_ROOT(&fs_info->tree_mod_log))
+                WARN(1, KERN_ERR "btrfs: tree_mod_log rb tree not empty when "
                         "creating a fresh transaction\n");
-                WARN_ON(1);
-        }
         atomic_set(&fs_info->tree_mod_seq, 0);
 
         spin_lock_init(&cur_trans->commit_lock);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index eeed97d19dee..3f4bfee66d7b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3323,9 +3323,8 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
                 cur = cur->next;
 
                 if (!device->writeable) {
-                        printk(KERN_ERR
+                        WARN(1, KERN_ERR
                                "btrfs: read-only device in alloc_list\n");
-                        WARN_ON(1);
                         continue;
                 }