Skip to content

Commit b30a0ce

Browse files
fdmananakdave
authored andcommitted
btrfs: use btrfs_warn() to log message at btrfs_add_extent_mapping()
At btrfs_add_extent_mapping(), if we failed to merge the extent map, which is unexpected and theoretically should never happen, we use WARN_ONCE() to log a message which is not great because we don't get information about which filesystem it relates to in case we have multiple btrfs filesystems mounted. So change this to use btrfs_warn() and surround the error check with WARN_ON() so we always get a useful stack trace and the condition is flagged as "unlikely" since it's not expected to ever happen. Reviewed-by: Qu Wenruo <[email protected]> Reviewed-by: Anand Jain <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 0305afd commit b30a0ce

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/btrfs/extent_map.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -629,13 +629,13 @@ int btrfs_add_extent_mapping(struct btrfs_fs_info *fs_info,
629629
*/
630630
ret = merge_extent_mapping(em_tree, existing,
631631
em, start);
632-
if (ret) {
632+
if (WARN_ON(ret)) {
633633
free_extent_map(em);
634634
*em_in = NULL;
635-
WARN_ONCE(ret,
636-
"extent map merge error existing [%llu, %llu) with em [%llu, %llu) start %llu\n",
637-
existing->start, extent_map_end(existing),
638-
orig_start, orig_start + orig_len, start);
635+
btrfs_warn(fs_info,
636+
"extent map merge error existing [%llu, %llu) with em [%llu, %llu) start %llu",
637+
existing->start, extent_map_end(existing),
638+
orig_start, orig_start + orig_len, start);
639639
}
640640
free_extent_map(existing);
641641
}

0 commit comments

Comments
 (0)