From patchwork Fri Sep 29 19:44:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 9978563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B40AF60311 for ; Fri, 29 Sep 2017 19:44:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A713E298AB for ; Fri, 29 Sep 2017 19:44:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C32A298AD; Fri, 29 Sep 2017 19:44:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54DBF298AB for ; Fri, 29 Sep 2017 19:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752591AbdI2Toj (ORCPT ); Fri, 29 Sep 2017 15:44:39 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:33095 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbdI2Toi (ORCPT ); Fri, 29 Sep 2017 15:44:38 -0400 Received: by mail-qk0-f193.google.com with SMTP id b82so20860qkc.0 for ; Fri, 29 Sep 2017 12:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=skgVn1lg9G+3mEUiusCBR+1yLniMmnkYwybg24FA8eQ=; b=xSWPmxBPBm0UtUMMpSNMnzK8MUffeazr5oZi1PgduixtEweJoqSA09Mu9yQZEfOdDw d5aumonUVEI4KmYvXbRbF4zL3H32r2wNrYlImyuwTDjzeQyX4IGjs7SrODpGWf0j9Wi0 +xTnk1p65BGysXA9lWuyuuYpV4OSX4LUgb9gFFr03v17AqVnPyTZemTVC7TkPDMtaW7j CmIfLZu72vxun+BDgjmlhnEV20w/b5mFcPlJIKLGaPYFKvbu+vnqtymhYBOqa8doNZQg mffgC1r7HGKmJ6X4vc3qhdN1jGLZOCvM8KSwkyC1q+OggLWklAJSr9WnGDjPXZH1Sj96 +azw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=skgVn1lg9G+3mEUiusCBR+1yLniMmnkYwybg24FA8eQ=; b=jB6y6OvjSLksZSKVX5CC64wF5tCmeQkpXEpFrkTaeQoGJZvl628P4GzJitQzS2MVJp r6lTi3Mg0TAha/xb8S2OFvo/qGpJOEMfXbcxCIIl6azlvt/80BWEutT0Kk+cLSIIUx3p Hxjz0hQEvmz7WalVvJ1mZkcYH3dK4qPOXAFTgNPAFuRMTWQ8yLusDOvHoCphOU+lhI8r hhpbOhMLPx23/Jm4n7etkKW1O65nXxsrenVfPTl2Tw9bWujfyVtGwZc1v0wYQDg31UQ3 NsjHinZXUfOru3WbGEXYGpH+3cg2Ak/abWNcgMOFjJD6nzg8Q+kb8zGVow0l9rglMXVO zShQ== X-Gm-Message-State: AMCzsaUWHIAJyFXa4MnGwC0cBGU9tqOiBAUpe30lKuxuHbkzdi7V0j9O F7TcLyy3TOKgLw/8ne/CoUjUmw== X-Google-Smtp-Source: AOwi7QC/YxY3YaLQrNx/QzhnQHuIUG4sOPcUXnoI6xm2Ro0PqBCbUPaOgdBvDk4qdoUwkh5jucW0qA== X-Received: by 10.55.145.132 with SMTP id t126mr4272688qkd.79.1506714277556; Fri, 29 Sep 2017 12:44:37 -0700 (PDT) Received: from localhost ([2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id h4sm3243769qth.75.2017.09.29.12.44.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Sep 2017 12:44:37 -0700 (PDT) From: Josef Bacik X-Google-Original-From: Josef Bacik To: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 21/21] btrfs: add assertions for releasing trans handle reservations Date: Fri, 29 Sep 2017 15:44:05 -0400 Message-Id: <1506714245-23072-22-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506714245-23072-1-git-send-email-jbacik@fb.com> References: <1506714245-23072-1-git-send-email-jbacik@fb.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These are useful for debugging problems where we mess with trans->block_rsv to make sure we're not screwing something up. Signed-off-by: Josef Bacik Reviewed-by: David Sterba --- fs/btrfs/extent-tree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index dc966978ca7b..0bdc10b453b9 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5897,12 +5897,15 @@ static void release_global_block_rsv(struct btrfs_fs_info *fs_info) void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info) { - if (!trans->block_rsv) + if (!trans->block_rsv) { + ASSERT(!trans->bytes_reserved); return; + } if (!trans->bytes_reserved) return; + ASSERT(trans->block_rsv == &fs_info->trans_block_rsv); trace_btrfs_space_reservation(fs_info, "transaction", trans->transid, trans->bytes_reserved, 0); btrfs_block_rsv_release(fs_info, trans->block_rsv,