diff options
| author | Jan Kara | 2018-11-08 14:01:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-22 21:40:36 +0100 |
| commit | 38d9cce3d61fe8d6ba24413eba74b4c8d24797f9 (patch) | |
| tree | ffe749d32ae67dbffaab21c36e8171c83a082b35 /drivers/block/loop.c | |
| parent | block/loop: Use global lock for ioctl() operation. (diff) | |
| download | kernel-qcow2-linux-38d9cce3d61fe8d6ba24413eba74b4c8d24797f9.tar.gz kernel-qcow2-linux-38d9cce3d61fe8d6ba24413eba74b4c8d24797f9.tar.xz kernel-qcow2-linux-38d9cce3d61fe8d6ba24413eba74b4c8d24797f9.zip | |
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>
Diffstat (limited to 'drivers/block/loop.c')
| -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 d0f1b7106572..cc43d835fe6f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1642,12 +1642,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) { @@ -1657,7 +1660,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, @@ -1668,12 +1671,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); } |