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: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 716abee16a5b..3c16da51348f 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2552,8 +2552,7 @@ again:
                 failed = 0;
                 retried = true;
                 goto again;
-        } else if (failed && retried) {
-                WARN_ON(1);
+        } else if (WARN_ON(failed && retried)) {
                 ret = -ENOSPC;
         }
 error:
@@ -5402,10 +5401,8 @@ static int bio_size_ok(struct block_device *bdev, struct bio *bio,
                 .bi_rw = bio->bi_rw,
         };
 
-        if (bio->bi_vcnt == 0) {
-                WARN_ON(1);
+        if (WARN_ON(bio->bi_vcnt == 0))
                 return 1;
-        }
 
         prev = &bio->bi_io_vec[bio->bi_vcnt - 1];
         if (bio_sectors(bio) > max_sectors)
@@ -5638,10 +5635,8 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
         struct btrfs_device *dev;
         u64 tmp;
 
-        if (!devid && !fs_info) {
-                WARN_ON(1);
+        if (WARN_ON(!devid && !fs_info))
                 return ERR_PTR(-EINVAL);
-        }
 
         dev = __alloc_device();
         if (IS_ERR(dev))