btrfs: convert WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG)) to DEBUG_WARN

Use the conditional warning instead of typing the whole condition.
Optional message is printed where it seems clear what could be the
problem.

Conversion is left out in btree_csum_one_bio() because of the additional
condition.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 5936cff80ff3d30b10aac0ccbc6d6f5d2d5d5dce..e76e1845cfce14da32d86238df9d6699d0a4b93c 100644 (file)
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -2877,7 +2877,7 @@ int btrfs_backref_iter_start(struct btrfs_backref_iter *iter, u64 bytenr)
                goto release;
        }
        if (path->slots[0] == 0) {
-               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+               DEBUG_WARN();
                ret = -EUCLEAN;
                goto release;
        }

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 280bc0ee60465f0e03bd5b80f965aac4b9c8450a..1541fd19d5ce37766f735f9285567f54cd562cd3 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4436,7 +4436,7 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info)
        set_bit(BTRFS_FS_CLOSING_DONE, &fs_info->flags);
 
        if (btrfs_check_quota_leak(fs_info)) {
-               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+               DEBUG_WARN("qgroup reserved space leaked");
                btrfs_err(fs_info, "qgroup reserved space leaked");
        }
 

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a68a8a07caff9fd1fe7348d05854494131e9b29e..a7564b39eb5c9cd8fd07d1d1ec61cd472ebfbc62 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6397,7 +6397,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)
 
                /* Check if there are any CHUNK_* bits left */
                if (start > device->total_bytes) {
-                       WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+                       DEBUG_WARN();
                        btrfs_warn_in_rcu(fs_info,
 "ignoring attempt to trim beyond device size: offset %llu length %llu device %s device size %llu",
                                          start, end - start + 1,

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8366dde0979476868f2d39701a52f3e1b0fff1f3..22456f456303ed0a7bd465c9a41784a7da67b279 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3697,7 +3697,7 @@ static bool report_eb_range(const struct extent_buffer *eb, unsigned long start,
        btrfs_warn(eb->fs_info,
                "access to eb bytenr %llu len %u out of range start %lu len %lu",
                eb->start, eb->len, start, len);
-       WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+       DEBUG_WARN();
 
        return true;
 }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e1c1ea41211e4580e98cf40bc021cd13a7a002ab..1e5b9e9c2d2593c38122f484a7e4dc122b01e4e4 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -777,9 +777,7 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start,
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
 
        if (!btrfs_inode_can_compress(inode)) {
-               WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),
-                       KERN_ERR "BTRFS: unexpected compression for ino %llu\n",
-                       btrfs_ino(inode));
+               DEBUG_WARN("BTRFS: unexpected compression for ino %llu", btrfs_ino(inode));
                return 0;
        }
 
@@ -2880,7 +2878,7 @@ int btrfs_writepage_cow_fixup(struct folio *folio)
         * We should not hit such out-of-band dirty folios anymore.
         */
        if (IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL)) {
-               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+               DEBUG_WARN();
                btrfs_err_rl(fs_info,
        "root %lld ino %llu folio %llu is marked dirty without notifying the fs",
                             BTRFS_I(inode)->root->root_key.objectid,

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 944c207cca87ff1ddedc8992e8327493331b6e66..b3176edbde82a0c2027553c014c68d119dbc7ceb 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1823,7 +1823,7 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)
        if (qgroup->rsv.values[BTRFS_QGROUP_RSV_DATA] ||
            qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC] ||
            qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS]) {
-               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+               DEBUG_WARN();
                btrfs_warn_rl(fs_info,
 "to be deleted qgroup %u/%llu has non-zero numbers, data %llu meta prealloc %llu meta pertrans %llu",
                              btrfs_qgroup_level(qgroup->qgroupid),
@@ -1843,7 +1843,7 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)
            !(fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT)) {
                if (qgroup->rfer || qgroup->excl ||
                    qgroup->rfer_cmpr || qgroup->excl_cmpr) {
-                       WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+                       DEBUG_WARN();
                        btrfs_warn_rl(fs_info,
 "to be deleted qgroup %u/%llu has non-zero numbers, rfer %llu rfer_cmpr %llu excl %llu excl_cmpr %llu",
                                      btrfs_qgroup_level(qgroup->qgroupid),
@@ -4767,7 +4767,7 @@ int btrfs_qgroup_add_swapped_blocks(struct btrfs_root *subvol_root,
                                 * Marking qgroup inconsistent should be enough
                                 * for end users.
                                 */
-                               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+                               DEBUG_WARN("duplicated but mismatched entry found");
                                ret = -EEXIST;
                        }
                        kfree(block);

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 6ca3c09514e7b54e0aca6345e0fd96116b962041..8f4703b488b71d3a59687796896b95a0f23f70b5 100644 (file)
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -2230,8 +2230,7 @@ int btrfs_verify_level_key(struct extent_buffer *eb,
 
        found_level = btrfs_header_level(eb);
        if (unlikely(found_level != check->level)) {
-               WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),
-                    KERN_ERR "BTRFS: tree level check failed\n");
+               DEBUG_WARN();
                btrfs_err(fs_info,
 "tree level mismatch detected, bytenr=%llu level expected=%u has=%u",
                          eb->start, check->level, found_level);
@@ -2255,7 +2254,7 @@ int btrfs_verify_level_key(struct extent_buffer *eb,
                btrfs_err(fs_info,
                "invalid tree nritems, bytenr=%llu nritems=0 expect >0",
                          eb->start);
-               WARN_ON(IS_ENABLED(CONFIG_BTRFS_DEBUG));
+               DEBUG_WARN();
                return -EUCLEAN;
        }
 
@@ -2266,8 +2265,7 @@ int btrfs_verify_level_key(struct extent_buffer *eb,
 
        ret = btrfs_comp_cpu_keys(&check->first_key, &found_key);
        if (unlikely(ret)) {
-               WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),
-                    KERN_ERR "BTRFS: tree first key check failed\n");
+               DEBUG_WARN();
                btrfs_err(fs_info,
 "tree first key mismatch detected, bytenr=%llu parent_transid=%llu key expected=(%llu,%u,%llu) has=(%llu,%u,%llu)",
                          eb->start, check->transid, check->first_key.objectid,