From: Greg Kroah-Hartman Date: Sat, 16 Sep 2023 12:54:52 +0000 (+0200) Subject: drop 4.14 btrfs patch X-Git-Tag: v5.10.195~32 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4906de2353ff9189635798b104e20be4d48ec5e0;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.14 btrfs patch --- diff --git a/queue-4.14/btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch b/queue-4.14/btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch deleted file mode 100644 index d07f7481b92..00000000000 --- a/queue-4.14/btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4490e803e1fe9fab8db5025e44e23b55df54078b Mon Sep 17 00:00:00 2001 -From: Filipe Manana -Date: Wed, 26 Jul 2023 16:56:57 +0100 -Subject: btrfs: don't start transaction when joining with TRANS_JOIN_NOSTART - -From: Filipe Manana - -commit 4490e803e1fe9fab8db5025e44e23b55df54078b upstream. - -When joining a transaction with TRANS_JOIN_NOSTART, if we don't find a -running transaction we end up creating one. This goes against the purpose -of TRANS_JOIN_NOSTART which is to join a running transaction if its state -is at or below the state TRANS_STATE_COMMIT_START, otherwise return an --ENOENT error and don't start a new transaction. So fix this to not create -a new transaction if there's no running transaction at or below that -state. - -CC: stable@vger.kernel.org # 4.14+ -Fixes: a6d155d2e363 ("Btrfs: fix deadlock between fiemap and transaction commits") -Signed-off-by: Filipe Manana -Signed-off-by: David Sterba -Signed-off-by: Greg Kroah-Hartman ---- - fs/btrfs/transaction.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - ---- a/fs/btrfs/transaction.c -+++ b/fs/btrfs/transaction.c -@@ -216,10 +216,11 @@ loop: - spin_unlock(&fs_info->trans_lock); - - /* -- * If we are ATTACH, we just want to catch the current transaction, -- * and commit it. If there is no transaction, just return ENOENT. -+ * If we are ATTACH or TRANS_JOIN_NOSTART, we just want to catch the -+ * current transaction, and commit it. If there is no transaction, just -+ * return ENOENT. - */ -- if (type == TRANS_ATTACH) -+ if (type == TRANS_ATTACH || type == TRANS_JOIN_NOSTART) - return -ENOENT; - - /* diff --git a/queue-4.14/series b/queue-4.14/series index 297e7e6de4a..7f48c6d6589 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -141,4 +141,3 @@ igbvf-change-igbvf_min-to-allow-set-rx-tx-value-betw.patch igb-change-igb_min-to-allow-set-rx-tx-value-between-.patch ata-sata_gemini-add-missing-module_description.patch ata-pata_ftide010-add-missing-module_description.patch -btrfs-don-t-start-transaction-when-joining-with-trans_join_nostart.patch