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>

1 files changed, 7 insertions, 12 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) -