From patchwork Fri May 11 07:56:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10393409 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 DD341601A0 for ; Fri, 11 May 2018 07:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A30828E09 for ; Fri, 11 May 2018 07:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F0AF28E17; Fri, 11 May 2018 07:56:45 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, 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 5094828E16 for ; Fri, 11 May 2018 07:56:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449AbeEKH43 (ORCPT ); Fri, 11 May 2018 03:56:29 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:41661 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752191AbeEKH4Y (ORCPT ); Fri, 11 May 2018 03:56:24 -0400 Received: by mail-pl0-f67.google.com with SMTP id az12-v6so2837382plb.8 for ; Fri, 11 May 2018 00:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ydMvFPYu8tRoy+NC0sjrb82sJ+nYefBq6bYq4w8QthQ=; b=f3RvJr8SsX95iNq3RUEpO6GhypKD+nhC2keOhN8MUR8FpoTfqUpFTZEI2/DM4akOYG INpV8hIwQsqu7KpmzgriHXygssi0EGk+QN14ayPewny6R349kfvUMCXznqGlngzfToQy yPgitk3Y2Nmeyty4Gh1HiL3bW10oMj59baVzecbm9ifKhH/0bdV31iziasqEhH/u10BD JHKymyKGsALALXRbpIWlI0TMuGfIN+zoG80dTRRIVk/JpUUSHa3ExPuLzHJPbmCaOs9N M3bnE/7OZcqpQb+4HoY90QhVKc4WMvdhcyyrBC51FDPKekcIbTr2fbHkJ2cPXzr5S3BW Kv0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ydMvFPYu8tRoy+NC0sjrb82sJ+nYefBq6bYq4w8QthQ=; b=NMNrljzl9vwGzmquG0zGt/rTXM88oKgvrTZ91z/An9PKfVfYb1BswhQiGL+85IflxS jK5D+PhwGKGGqSM6DUCRyEvU9fhDbet4BuH0CE/enAuyUt5c3r0XaKMRByM2eKZvOdz9 sHuzeeebavEvErOJbV+5/3LaaEoRX+vmPuels/bltO4Vx7M7pt24MgxUYbSu00vY1ZjY YteBK41T98EhKfCDDD6Io1xOBP/3HMewJur9aSZPo1v2FRhPdrnZF1MMdMvWY9UrFJcb D9r9+Rt5X4uMV3XUyYiPsecM2B7c2QuGGjXksBlXuxTIVBvYTqmkeYxX8dAL8Kdq3vZd auvQ== X-Gm-Message-State: ALKqPwdyRNVvL1Uf9Ho47Omg4YjEqfrEu12XesK10kACOToY2Ssh2VYU p5J+c+j3G8DfN49bwgNzeg+Ft+Sw5zA= X-Google-Smtp-Source: AB8JxZruNoll5MOxXdQ8vKD6gN7Lovu3MSb47SeNUqNdSTrF07xRHuIOTxVPGAtTG7+gWcrQ6dhWCw== X-Received: by 2002:a17:902:43a4:: with SMTP id j33-v6mr4599314pld.118.1526025383115; Fri, 11 May 2018 00:56:23 -0700 (PDT) Received: from vader.hsd1.wa.comcast.net ([2601:602:8800:a9a9:e6a7:a0ff:fe0b:c9a8]) by smtp.gmail.com with ESMTPSA id e126-v6sm5402008pfh.5.2018.05.11.00.56.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 May 2018 00:56:22 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, Chris Mason , Josef Bacik , Nikolay Borisov Subject: [PATCH v3 03/11] Btrfs: don't BUG_ON() in btrfs_truncate_inode_items() Date: Fri, 11 May 2018 00:56:08 -0700 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval btrfs_free_extent() can fail because of ENOMEM. There's no reason to panic here, we can just abort the transaction. Fixes: f4b9aa8d3b87 ("btrfs_truncate") Reviewed-by: Nikolay Borisov Signed-off-by: Omar Sandoval --- fs/btrfs/inode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 79d1da01a90d..bd4975476f0e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4655,7 +4655,10 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, extent_num_bytes, 0, btrfs_header_owner(leaf), ino, extent_offset); - BUG_ON(ret); + if (ret) { + btrfs_abort_transaction(trans, ret); + break; + } if (btrfs_should_throttle_delayed_refs(trans, fs_info)) btrfs_async_run_delayed_refs(fs_info, trans->delayed_ref_updates * 2,