From: Zygo Blaxell Date: Tue, 30 Apr 2019 05:32:35 +0000 (-0400) Subject: zygo: btrfs: don't need the merge_ref warning all the time X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7db03751a7fd9212b170344cfcf45c51a168e1;p=linux zygo: btrfs: don't need the merge_ref warning all the time (cherry picked from commit 9d645400d3987be35397789556c6f80928af11e8) --- diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index afc2f3726dcc..beb28db4b3a6 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -294,7 +294,7 @@ static bool merge_ref(struct btrfs_trans_handle *trans, /* * Can't have multiples of the same ref on a tree block. */ - WARN_ON(ref->type == BTRFS_TREE_BLOCK_REF_KEY || + WARN_ON_ONCE(ref->type == BTRFS_TREE_BLOCK_REF_KEY || ref->type == BTRFS_SHARED_BLOCK_REF_KEY); } }