From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A47AC0015E for ; Wed, 9 Aug 2023 11:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234119AbjHILiF (ORCPT ); Wed, 9 Aug 2023 07:38:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234118AbjHILiF (ORCPT ); Wed, 9 Aug 2023 07:38:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABD7CE3 for ; Wed, 9 Aug 2023 04:38:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 43AD363592 for ; Wed, 9 Aug 2023 11:38:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 553E2C433C7; Wed, 9 Aug 2023 11:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691581083; bh=uQKkxcsQd7CmRNCjgTk2V6djG6DHfwgMWY3o2QZa99s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBBR5KlafNKtcJLWRJUjhlfgXLkcuMt4VninVunddlJHxw4dINZltnYXROW5Szpg1 Im0CAHx+bqtmEB9ywHYaSScMhpQAw8DV0OUSl/wjjBznjQjtzYKo7hsFN7BVyx0WD5 OadCHwJgUg66tnx2MN78ENAfS7ZEi2GFHQ4yZ3xs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 5.10 100/201] btrfs: check if the transaction was aborted at btrfs_wait_for_commit() Date: Wed, 9 Aug 2023 12:41:42 +0200 Message-ID: <20230809103647.154638048@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230809103643.799166053@linuxfoundation.org> References: <20230809103643.799166053@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Filipe Manana [ Upstream commit bf7ecbe9875061bf3fce1883e3b26b77f847d1e8 ] At btrfs_wait_for_commit() we wait for a transaction to finish and then always return 0 (success) without checking if it was aborted, in which case the transaction didn't happen due to some critical error. Fix this by checking if the transaction was aborted. Fixes: 462045928bda ("Btrfs: add START_SYNC, WAIT_SYNC ioctls") CC: stable@vger.kernel.org # 4.19+ Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/transaction.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index ff372f1226a3b..abd67f984fbcf 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -891,6 +891,7 @@ int btrfs_wait_for_commit(struct btrfs_fs_info *fs_info, u64 transid) } wait_for_commit(cur_trans); + ret = cur_trans->aborted; btrfs_put_transaction(cur_trans); out: return ret; -- 2.40.1