diff options
| author | Gioh Kim <gi-oh.kim@cloud.ionos.com> | 2021-04-19 10:37:13 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-04-20 17:59:04 +0300 |
| commit | c77bfa8f5dbd3f8bbb99a751bab00ebcc229a5c5 (patch) | |
| tree | d510b6fca467acbe0e828f25d8a01aaa3c293044 /drivers/block/rnbd/rnbd-srv-sysfs.c | |
| parent | b168e1d85cf3201663698dd9dcb3d46c7e67f621 (diff) | |
| download | linux-c77bfa8f5dbd3f8bbb99a751bab00ebcc229a5c5.tar.xz | |
block/rnbd-srv: Remove force_close file after holding a lock
We changed the rnbd_srv_sess_dev_force_close to use try-lock
because rnbd_srv_sess_dev_force_close and process_msg_close
can generate a deadlock.
Now rnbd_srv_sess_dev_force_close would do nothing
if it fails to get the lock. So removing the force_close
file should be moved to after the lock. Or the force_close
file is removed but the others are not removed.
Signed-off-by: Gioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20210419073722.15351-11-gi-oh.kim@ionos.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/rnbd/rnbd-srv-sysfs.c')
| -rw-r--r-- | drivers/block/rnbd/rnbd-srv-sysfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/rnbd/rnbd-srv-sysfs.c b/drivers/block/rnbd/rnbd-srv-sysfs.c index 05ffe488ddc6..acf5fced11ef 100644 --- a/drivers/block/rnbd/rnbd-srv-sysfs.c +++ b/drivers/block/rnbd/rnbd-srv-sysfs.c @@ -147,10 +147,7 @@ static ssize_t rnbd_srv_dev_session_force_close_store(struct kobject *kobj, } rnbd_srv_info(sess_dev, "force close requested\n"); - - /* first remove sysfs itself to avoid deadlock */ - sysfs_remove_file_self(&sess_dev->kobj, &attr->attr); - rnbd_srv_sess_dev_force_close(sess_dev); + rnbd_srv_sess_dev_force_close(sess_dev, attr); return count; } |