queue-4.14/revert-loop-fold-__loop_release-into-loop_release.patch

   1 From 23b0213696688c5e7a3456221ac12bf3bae5e67b Mon Sep 17 00:00:00 2001
   2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   3 Date: Wed, 27 Feb 2019 15:09:22 +0100
   4 Subject: Revert "loop: Fold __loop_release into loop_release"
   5
   6 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   7
   8 This reverts commit f1e81ba8a3fa56dcc48828869b392b29559a0ac3 which is
   9 commit 967d1dc144b50ad005e5eecdfadfbcfb399ffff6 upstream.
  10
  11 It does not work properly in the 4.14.y tree and causes more problems
  12 than it fixes, so revert it.
  13
  14 Reported-by: Thomas Lindroth <thomas.lindroth@gmail.com>
  15 Reported-by: Jan Kara <jack@suse.cz>
  16 Cc: Jens Axboe <axboe@kernel.dk>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  drivers/block/loop.c |   16 +++++++++-------
  20  1 file changed, 9 insertions(+), 7 deletions(-)
  21
  22 --- a/drivers/block/loop.c
  23 +++ b/drivers/block/loop.c
  24 @@ -1634,15 +1634,12 @@ out:
  25         return err;
  26  }
  27
  28 -static void lo_release(struct gendisk *disk, fmode_t mode)
  29 +static void __lo_release(struct loop_device *lo)
  30  {
  31 -       struct loop_device *lo;
  32         int err;
  33
  34 -       mutex_lock(&loop_index_mutex);
  35 -       lo = disk->private_data;
  36         if (atomic_dec_return(&lo->lo_refcnt))
  37 -               goto unlock_index;
  38 +               return;
  39
  40         mutex_lock(&loop_ctl_mutex);
  41         if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) {
  42 @@ -1652,7 +1649,7 @@ static void lo_release(struct gendisk *d
  43                  */
  44                 err = loop_clr_fd(lo);
  45                 if (!err)
  46 -                       goto unlock_index;
  47 +                       return;
  48         } else if (lo->lo_state == Lo_bound) {
  49                 /*
  50                  * Otherwise keep thread (if running) and config,
  51 @@ -1663,7 +1660,12 @@ static void lo_release(struct gendisk *d
  52         }
  53
  54         mutex_unlock(&loop_ctl_mutex);
  55 -unlock_index:
  56 +}
  57 +
  58 +static void lo_release(struct gendisk *disk, fmode_t mode)
  59 +{
  60 +       mutex_lock(&loop_index_mutex);
  61 +       __lo_release(disk->private_data);
  62         mutex_unlock(&loop_index_mutex);
  63  }
  64