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 89813C001DC for ; Mon, 31 Jul 2023 12:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbjGaMSU (ORCPT ); Mon, 31 Jul 2023 08:18:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjGaMSU (ORCPT ); Mon, 31 Jul 2023 08:18:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1150011D for ; Mon, 31 Jul 2023 05:18:19 -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 A27C660DF6 for ; Mon, 31 Jul 2023 12:18:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A13C2C433C8; Mon, 31 Jul 2023 12:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1690805898; bh=evTptl37SZ2/cfQS5n8nn9Jkz+fInvS88p2RuQfXiDo=; h=Subject:To:Cc:From:Date:From; b=QGm7NEeehmkSO3Zficg0HGDToDhGDgRrzxYGnfsTIs95kNWEeAGrFFc7uBHpXfoQM xio1n19BhUYJtZBM2EddeOA2BlxhMTJjyUINGFKnzkw24/vvO33h5+IadyguNyVM1b fDNkOLGnUDyA6qkk2PjCc0dDKp+3BukGnoBlAnEA= Subject: FAILED: patch "[PATCH] btrfs: check if the transaction was aborted at" failed to apply to 4.14-stable tree To: fdmanana@suse.com, dsterba@suse.com, wqu@suse.com Cc: From: Date: Mon, 31 Jul 2023 14:18:07 +0200 Message-ID: <2023073107-greedy-comrade-d289@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x bf7ecbe9875061bf3fce1883e3b26b77f847d1e8 # git commit -s git send-email --to '' --in-reply-to '2023073107-greedy-comrade-d289@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: bf7ecbe98750 ("btrfs: check if the transaction was aborted at btrfs_wait_for_commit()") d0c2f4fa555e ("btrfs: make concurrent fsyncs wait less when waiting for a transaction commit") bf31f87f71cc ("btrfs: add wrapper for transaction abort predicate") 77745c05115f ("btrfs: migrate the dirty bg writeout code") 26ce2095e03c ("btrfs: migrate inc/dec_block_group_ro code") 8484764e8587 ("btrfs: temporarily export btrfs_get_restripe_target") 4358d9635a16 ("btrfs: migrate the block group read/creation code") e3e0520b32bc ("btrfs: migrate the block group removal code") 3b2a78f21d5c ("btrfs: temporarily export inc_block_group_ro") 9f21246d8c7e ("btrfs: migrate the block group caching code") 32a9991f15a0 ("btrfs: factor sysfs code out of link_block_group") 89439109bc2b ("btrfs: move sysfs declarations out of ctree.h") 6a9fb468f115 ("btrfs: make caching_thread use btrfs_find_next_key") caa4efafcf03 ("btrfs: temporarily export fragment_free_space") e3cb339fa5ca ("btrfs: export the caching control helpers") 6f410d1b3dbf ("btrfs: export the excluded extents helpers") 676f1f759fa3 ("btrfs: export the block group caching helpers") 3eeb3226a889 ("btrfs: migrate nocow and reservation helpers") 3cad128400c2 ("btrfs: migrate the block group ref counting stuff") 2e405ad84254 ("btrfs: migrate the block group lookup code") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bf7ecbe9875061bf3fce1883e3b26b77f847d1e8 Mon Sep 17 00:00:00 2001 From: Filipe Manana Date: Fri, 21 Jul 2023 10:49:20 +0100 Subject: [PATCH] btrfs: check if the transaction was aborted at btrfs_wait_for_commit() 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 diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index cf306351b148..f11d803b2c4e 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -931,6 +931,7 @@ int btrfs_wait_for_commit(struct btrfs_fs_info *fs_info, u64 transid) } wait_for_commit(cur_trans, TRANS_STATE_COMPLETED); + ret = cur_trans->aborted; btrfs_put_transaction(cur_trans); out: return ret;