diff options
| author |   Jan Kara <jack@suse.cz> | 2018-11-08 14:01:03 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-11-08 06:30:14 -0700 |
| commit | 967d1dc144b50ad005e5eecdfadfbcfb399ffff6 (patch) | |
| tree | d2f14f7ab84d2afa216d968c14d07a8a014ce8c0 /drivers/block/loop.c | |
| parent | block/loop: Use global lock for ioctl() operation. (diff) | |
| download | linux-dev-967d1dc144b50ad005e5eecdfadfbcfb399ffff6.tar.xz linux-dev-967d1dc144b50ad005e5eecdfadfbcfb399ffff6.zip | |
loop: Fold __loop_release into loop_release
__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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/block/loop.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 63008e879771..3de2cd94225a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1641,12 +1641,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) { @@ -1656,7 +1659,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, @@ -1667,12 +1670,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); } |