From patchwork Fri May 11 00:11:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 10392615 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 3C7A4601A0 for ; Fri, 11 May 2018 00:12:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 322E428D68 for ; Fri, 11 May 2018 00:12:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 267DF28D6E; Fri, 11 May 2018 00:12:07 +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 87CE228D68 for ; Fri, 11 May 2018 00:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbeEKAME (ORCPT ); Thu, 10 May 2018 20:12:04 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:44229 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbeEKALf (ORCPT ); Thu, 10 May 2018 20:11:35 -0400 Received: by mail-pl0-f68.google.com with SMTP id e6-v6so2211884plt.11 for ; Thu, 10 May 2018 17:11:34 -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=2gToP1JNwpcSfA/zl55vkI0t3cfRKzgiwh1h7aSpkqs=; b=cpWZWMuca046yb4RpY4qNTmUaOrfttHzE/VGQQSDzEq+Q5aKWHFubbu+7XjSSOqY/v ONsMZdK5MOUM0kaESe6h1Vy0U2DBgW/T/pb8UG7jb9rw/G+JIOhfx/9ANVI0azu7tPHQ QKxtqqYUGoQQxDcfNVpi8m7GLX6CXpMKo8zyCJarwqdOeEyc7e/BLT/334vN27TvmGyo 7nLTS1D1alN7W/unu9vRXAX0npCM+ArdaELNTDde3t7G3k4iP10pbq/rCuUIKOZM7YBT AESPIqqPZO9mKtOL4LZFiOhyiMo88s7pxxLORE7+RgC3KzPGMVF2DhON1PwNd05aDkOD Bjww== 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=2gToP1JNwpcSfA/zl55vkI0t3cfRKzgiwh1h7aSpkqs=; b=Bf4Nwv0z/9GIu0+FpE+vpVbD9EHA0rv6DW4W5W4F6To1keoW7iBLExXxEbB9saBx/h SgiSBa1z/yxEyEbrfJLq/mkPTD2dIz39ydzZhwAtkenFegaieo1m6ZsqhphwLmbEhxya P9H+Aj/o4rF/Z59vijg3HGscCFnn1TWGFpDqmD/kaQbteDnaSje2B7sGjJnJGM68UbsK azThZOCAPvpm2ppBhuT1XlscFQIiGQOLbNTXW9BfwY/muGERwsiuTD/Pifn0KVh4oQ2D YDZqRJalGLIKEyPeJGSQvHoFqpUGvwH4TMsm5o28bblymbOoF25SulT0+ACGZP7rqx9W 9FbA== X-Gm-Message-State: ALKqPwdMVOl0mXa9yUmltWQpTf15KuIlK5ZrDCV7LZzPel8qupQea7SS xo3i/H95/oka5BImtwWhYR7FcwOuOeE= X-Google-Smtp-Source: AB8JxZpq/TZe5cfV4Y9yJjKFFMwl+N1PdtShVLKalZvxGocWLXaxb4oMwP8Ipz0EJGvOo1P0sks/0Q== X-Received: by 2002:a17:902:7e05:: with SMTP id b5-v6mr3199922plm.230.1525997494135; Thu, 10 May 2018 17:11:34 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::4:32a8]) by smtp.gmail.com with ESMTPSA id x84-v6sm4699038pfi.160.2018.05.10.17.11.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 17:11:33 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, Chris Mason , Josef Bacik Subject: [PATCH v2 02/12] Btrfs: fix error handling in btrfs_truncate_inode_items() Date: Thu, 10 May 2018 17:11:12 -0700 Message-Id: <5afcb519e78bd1d5e1085e266eccb8c3ac3c1312.1525997057.git.osandov@fb.com> 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_truncate_inode_items() uses two variables for error handling, ret and err. These are not handled consistently, leading to a couple of bugs. - Errors from btrfs_del_items() are handled but not propagated to the caller - If btrfs_run_delayed_refs() fails and aborts the transaction, we continue running Just use ret everywhere and simplify things a bit, fixing both of these issues. Fixes: 79787eaab461 ("btrfs: replace many BUG_ONs with proper error handling") Fixes: 1262133b8d6f ("Btrfs: account for crcs in delayed ref processing") Reviewed-by: Nikolay Borisov Signed-off-by: Omar Sandoval --- fs/btrfs/inode.c | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index fef8dbb6a93f..79d1da01a90d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4442,7 +4442,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, int pending_del_slot = 0; int extent_type = -1; int ret; - int err = 0; u64 ino = btrfs_ino(BTRFS_I(inode)); u64 bytes_deleted = 0; bool be_nice = false; @@ -4494,22 +4493,19 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, * up a huge file in a single leaf. Most of the time that * bytes_deleted is > 0, it will be huge by the time we get here */ - if (be_nice && bytes_deleted > SZ_32M) { - if (btrfs_should_end_transaction(trans)) { - err = -EAGAIN; - goto error; - } + if (be_nice && bytes_deleted > SZ_32M && + btrfs_should_end_transaction(trans)) { + ret = -EAGAIN; + goto out; } - path->leave_spinning = 1; ret = btrfs_search_slot(trans, root, &key, path, -1, 1); - if (ret < 0) { - err = ret; + if (ret < 0) goto out; - } if (ret > 0) { + ret = 0; /* there are no items in the tree for us to truncate, we're * done */ @@ -4620,7 +4616,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, * We have to bail so the last_size is set to * just before this extent. */ - err = NEED_TRUNCATE_BLOCK; + ret = NEED_TRUNCATE_BLOCK; break; } @@ -4687,7 +4683,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, pending_del_nr); if (ret) { btrfs_abort_transaction(trans, ret); - goto error; + break; } pending_del_nr = 0; } @@ -4698,8 +4694,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, trans->delayed_ref_updates = 0; ret = btrfs_run_delayed_refs(trans, updates * 2); - if (ret && !err) - err = ret; + if (ret) + break; } } /* @@ -4707,8 +4703,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, * and let the transaction restart */ if (should_end) { - err = -EAGAIN; - goto error; + ret = -EAGAIN; + break; } goto search_again; } else { @@ -4716,32 +4712,37 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, } } out: - if (pending_del_nr) { - ret = btrfs_del_items(trans, root, path, pending_del_slot, + if (ret >= 0 && pending_del_nr) { + int err; + + err = btrfs_del_items(trans, root, path, pending_del_slot, pending_del_nr); - if (ret) - btrfs_abort_transaction(trans, ret); + if (err) { + btrfs_abort_transaction(trans, err); + ret = err; + } } -error: if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) { ASSERT(last_size >= new_size); - if (!err && last_size > new_size) + if (!ret && last_size > new_size) last_size = new_size; btrfs_ordered_update_i_size(inode, last_size, NULL); } btrfs_free_path(path); - if (be_nice && bytes_deleted > SZ_32M) { + if (be_nice && bytes_deleted > SZ_32M && (ret >= 0 || ret == -EAGAIN)) { unsigned long updates = trans->delayed_ref_updates; + int err; + if (updates) { trans->delayed_ref_updates = 0; - ret = btrfs_run_delayed_refs(trans, updates * 2); - if (ret && !err) - err = ret; + err = btrfs_run_delayed_refs(trans, updates * 2); + if (err) + ret = err; } } - return err; + return ret; } /*