git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From sgruszka@redhat.com  Mon Jul  8 15:59:16 2019
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Mon, 8 Jul 2019 14:01:34 +0200
   4 Subject: stable/btrfs: fix backport bug in d819d97ea025 ("btrfs: honor path->skip_locking in backref code")
   5 To: stable@vger.kernel.org
   6 Cc: linux-btrfs@vger.kernel.org
   7 Message-ID: <20190708120130.GA25587@redhat.com>
   8 Content-Disposition: inline
   9
  10 From: Stanislaw Gruszka <sgruszka@redhat.com>
  11
  12 Upstream commit 38e3eebff643 ("btrfs: honor path->skip_locking in
  13 backref code") was incorrectly backported to 4.14.y . It misses removal
  14 of two lines from original commit, what cause deadlock.
  15
  16 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203993
  17 Reported-by: Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
  18 Fixes: d819d97ea025 ("btrfs: honor path->skip_locking in backref code")
  19 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  20 Reviewed-by: Nikolay Borisov <nborisov@suse.com>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22
  23 ---
  24  fs/btrfs/backref.c |    2 --
  25  1 file changed, 2 deletions(-)
  26
  27 --- a/fs/btrfs/backref.c
  28 +++ b/fs/btrfs/backref.c
  29 @@ -1290,8 +1290,6 @@ again:
  30                                         ret = -EIO;
  31                                         goto out;
  32                                 }
  33 -                               btrfs_tree_read_lock(eb);
  34 -                               btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
  35                                 if (!path->skip_locking) {
  36                                         btrfs_tree_read_lock(eb);
  37                                         btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);