]> git.hungrycats.org Git - linux/commitdiff
Revert "Btrfs: fix regression when running delayed references"
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 10 Nov 2015 20:35:12 +0000 (15:35 -0500)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 10 Nov 2015 20:35:12 +0000 (15:35 -0500)
This reverts commit 13d843dc763edde6630f7b12ea7d3a098efd9730.

fs/btrfs/delayed-ref.c

index 296d40d2efedb035ab556bbeff67e4c6cbb89716..7832031fef68d67fc7f5e6bf1aaf5f1ea3466168 100644 (file)
@@ -220,7 +220,7 @@ static bool merge_ref(struct btrfs_trans_handle *trans,
                if (seq && next->seq >= seq)
                        goto next;
 
-               if (next->type != ref->type || next->no_quota != ref->no_quota)
+               if (next->type != ref->type)
                        goto next;
 
                if ((ref->type == BTRFS_TREE_BLOCK_REF_KEY ||