iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loop: Fold __loop_release into loop_release

Browse Source 
__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>
This commit is contained in:
Jan Kara 2018-11-08 14:01:03 +01:00 committed by Jens Axboe
parent 310ca162d7
commit 967d1dc144
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/block/loop.c
View File

@ -1641,12 +1641,15 @@ out:
return err; 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; int err;
mutex_lock(&loop_index_mutex);
lo = disk->private_data;
if (atomic_dec_return(&lo->lo_refcnt)) if (atomic_dec_return(&lo->lo_refcnt))
return; goto unlock_index;
mutex_lock(&loop_ctl_mutex); mutex_lock(&loop_ctl_mutex);
if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) { if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) {
@ -1656,7 +1659,7 @@ static void __lo_release(struct loop_device *lo)
*/ */
err = loop_clr_fd(lo); err = loop_clr_fd(lo);
if (!err) if (!err)
return; goto unlock_index;
} else if (lo->lo_state == Lo_bound) { } else if (lo->lo_state == Lo_bound) {
/* /*
* Otherwise keep thread (if running) and config, * Otherwise keep thread (if running) and config,
@ -1667,12 +1670,7 @@ static void __lo_release(struct loop_device *lo)
} }
mutex_unlock(&loop_ctl_mutex); mutex_unlock(&loop_ctl_mutex);
} unlock_index:
static void lo_release(struct gendisk *disk, fmode_t mode)
{
mutex_lock(&loop_index_mutex);
__lo_release(disk->private_data);
mutex_unlock(&loop_index_mutex); mutex_unlock(&loop_index_mutex);
} }