Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d839c10 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ae3d167

drivers/block/loop.c

+7 −9
Original line number Diff line number Diff line
@@ -1575,12 +1575,15 @@ static int lo_open(struct block_device *bdev, fmode_t mode) 
	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) {
@@ -1590,7 +1593,7 @@ static void __lo_release(struct loop_device *lo) 
		 */

		err = loop_clr_fd(lo);

		if (!err)

			return;

			goto unlock_index;

	} else {

		/*

		 * Otherwise keep thread (if running) and config,
@@ -1600,12 +1603,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);

}