From: Greg Kroah-Hartman Date: Mon, 8 Jul 2019 13:59:49 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.1.17~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4884e81d2404dbf9233189a76b4ebc19329bdaa;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: stable-btrfs-fix-backport-bug-in-d819d97ea025-btrfs-honor-path-skip_locking-in-backref-code.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index c16bf428017..28a6a73c183 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -53,3 +53,4 @@ svcrdma-ignore-source-port-when-computing-drc-hash.patch mips-fix-bounds-check-virt_addr_valid.patch mips-add-missing-ehb-in-mtc0-mfc0-sequence.patch dmaengine-imx-sdma-remove-bd_intr-for-channel0.patch +stable-btrfs-fix-backport-bug-in-d819d97ea025-btrfs-honor-path-skip_locking-in-backref-code.patch diff --git a/queue-4.14/stable-btrfs-fix-backport-bug-in-d819d97ea025-btrfs-honor-path-skip_locking-in-backref-code.patch b/queue-4.14/stable-btrfs-fix-backport-bug-in-d819d97ea025-btrfs-honor-path-skip_locking-in-backref-code.patch new file mode 100644 index 00000000000..de9244ab7b2 --- /dev/null +++ b/queue-4.14/stable-btrfs-fix-backport-bug-in-d819d97ea025-btrfs-honor-path-skip_locking-in-backref-code.patch @@ -0,0 +1,36 @@ +From sgruszka@redhat.com Mon Jul 8 15:59:16 2019 +From: Stanislaw Gruszka +Date: Mon, 8 Jul 2019 14:01:34 +0200 +Subject: stable/btrfs: fix backport bug in d819d97ea025 ("btrfs: honor path->skip_locking in backref code") +To: stable@vger.kernel.org +Cc: linux-btrfs@vger.kernel.org +Message-ID: <20190708120130.GA25587@redhat.com> +Content-Disposition: inline + +From: Stanislaw Gruszka + +Upstream commit 38e3eebff643 ("btrfs: honor path->skip_locking in +backref code") was incorrectly backported to 4.14.y . It misses removal +of two lines from original commit, what cause deadlock. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203993 +Reported-by: Olivier Mazouffre +Fixes: d819d97ea025 ("btrfs: honor path->skip_locking in backref code") +Signed-off-by: Stanislaw Gruszka +Signed-off-by: Greg Kroah-Hartman + +--- + fs/btrfs/backref.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/fs/btrfs/backref.c ++++ b/fs/btrfs/backref.c +@@ -1290,8 +1290,6 @@ again: + ret = -EIO; + goto out; + } +- btrfs_tree_read_lock(eb); +- btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK); + if (!path->skip_locking) { + btrfs_tree_read_lock(eb); + btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);