leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loop: Get rid of 'nested' acquisition of loop_ctl_mutex

Browse Source 
The nested acquisition of loop_ctl_mutex (->lo_ctl_mutex back then) has
been introduced by commit f028f3b2f9 "loop: fix circular locking in
loop_clr_fd()" to fix lockdep complains about bd_mutex being acquired
after lo_ctl_mutex during partition rereading. Now that these are
properly fixed, let's stop fooling lockdep.

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:16 +01:00 committed by Jens Axboe
parent 1dded9acf6
commit c28445fa06
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/loop.c
View File

@ -681,7 +681,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
int error;
bool partscan;
error = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
error = mutex_lock_killable(&loop_ctl_mutex);
if (error)
return error;
error = -ENXIO;
@ -919,7 +919,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
if (!file)
goto out;
error = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
error = mutex_lock_killable(&loop_ctl_mutex);
if (error)
goto out_putf;
@ -1135,7 +1135,7 @@ static int loop_clr_fd(struct loop_device *lo)
{
int err;
err = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
err = mutex_lock_killable(&loop_ctl_mutex);
if (err)
return err;
if (lo->lo_state != Lo_bound) {
@ -1172,7 +1172,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
struct block_device *bdev;
bool partscan = false;
err = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
err = mutex_lock_killable(&loop_ctl_mutex);
if (err)
return err;
if (lo->lo_encrypt_key_size &&
@ -1277,7 +1277,7 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
struct kstat stat;
int ret;
ret = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
ret = mutex_lock_killable(&loop_ctl_mutex);
if (ret)
return ret;
if (lo->lo_state != Lo_bound) {
@ -1466,7 +1466,7 @@ static int lo_simple_ioctl(struct loop_device *lo, unsigned int cmd,
{
int err;
err = mutex_lock_killable_nested(&loop_ctl_mutex, 1);
err = mutex_lock_killable(&loop_ctl_mutex);
if (err)
return err;
switch (cmd) {