loop: Fold __loop_release into loop_release

commit 967d1dc144b50ad005e5eecdfadfbcfb399ffff6 upstream.

__loop_release() has a single call site. Fold it there. This is
currently not a huge win but it will make following replacement of
loop_index_mutex more obvious.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index aa9e9b2..cb13430 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1603,12 +1603,15 @@ out:
        return err;
 }
 
-static void __lo_release(struct loop_device *lo)
+static void lo_release(struct gendisk *disk, fmode_t mode)
 {
+       struct loop_device *lo;
        int err;
 
+       mutex_lock(&loop_index_mutex);
+       lo = disk->private_data;
        if (atomic_dec_return(&lo->lo_refcnt))
-               return;
+               goto unlock_index;
 
        mutex_lock(&loop_ctl_mutex);
        if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) {
@@ -1618,7 +1621,7 @@ static void __lo_release(struct loop_device *lo)
                 */
                err = loop_clr_fd(lo);
                if (!err)
-                       return;
+                       goto unlock_index;
        } else if (lo->lo_state == Lo_bound) {
                /*
                 * Otherwise keep thread (if running) and config,
@@ -1629,12 +1632,7 @@ static void __lo_release(struct loop_device *lo)
        }
 
        mutex_unlock(&loop_ctl_mutex);
-}
-
-static void lo_release(struct gendisk *disk, fmode_t mode)
-{
-       mutex_lock(&loop_index_mutex);
-       __lo_release(disk->private_data);
+unlock_index:
        mutex_unlock(&loop_index_mutex);
 }