mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
Revert "loop: Fold __loop_release into loop_release"
This reverts commit7d839c10b8
which is commit967d1dc144
upstream. It does not work properly in the 4.9.y tree and causes more problems than it fixes, so revert it. Reported-by: Thomas Lindroth <thomas.lindroth@gmail.com> Reported-by: Jan Kara <jack@suse.cz> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c6ae51ad49
commit
e5c5b8ed71
1 changed files with 9 additions and 7 deletions
|
@ -1575,15 +1575,12 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
|
|||
return err;
|
||||
}
|
||||
|
||||
static void lo_release(struct gendisk *disk, fmode_t mode)
|
||||
static void __lo_release(struct loop_device *lo)
|
||||
{
|
||||
struct loop_device *lo;
|
||||
int err;
|
||||
|
||||
mutex_lock(&loop_index_mutex);
|
||||
lo = disk->private_data;
|
||||
if (atomic_dec_return(&lo->lo_refcnt))
|
||||
goto unlock_index;
|
||||
return;
|
||||
|
||||
mutex_lock(&loop_ctl_mutex);
|
||||
if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) {
|
||||
|
@ -1593,7 +1590,7 @@ static void lo_release(struct gendisk *disk, fmode_t mode)
|
|||
*/
|
||||
err = loop_clr_fd(lo);
|
||||
if (!err)
|
||||
goto unlock_index;
|
||||
return;
|
||||
} else {
|
||||
/*
|
||||
* Otherwise keep thread (if running) and config,
|
||||
|
@ -1603,7 +1600,12 @@ static void lo_release(struct gendisk *disk, fmode_t mode)
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue