Commit 4bc14f31 authored by Md Haris Iqbal's avatar Md Haris Iqbal Committed by Jens Axboe
Browse files

block/rnbd-srv: Set keep_id to true after mutex_trylock 



After setting keep_id if the mutex trylock fails, the keep_id stays set
for the rest of the sess_dev lifetime.

Therefore, set keep_id to true after mutex_trylock succeeds, so that a
failure of trylock does'nt touch keep_id.

Fixes: b168e1d8 ("block/rnbd-srv: Prevent a deadlock generated by accessing sysfs in parallel")
Cc: gi-oh.kim@ionos.com
Signed-off-by: default avatarMd Haris Iqbal <haris.iqbal@ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20220707143122.460362-2-haris.iqbal@ionos.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1a70200f

drivers/block/rnbd/rnbd-srv.c

+2 −1
Original line number Diff line number Diff line
@@ -323,10 +323,11 @@ void rnbd_srv_sess_dev_force_close(struct rnbd_srv_sess_dev *sess_dev, 
{

	struct rnbd_srv_session	*sess = sess_dev->sess;



	sess_dev->keep_id = true;

	/* It is already started to close by client's close message. */

	if (!mutex_trylock(&sess->lock))

		return;



	sess_dev->keep_id = true;

	/* first remove sysfs itself to avoid deadlock */

	sysfs_remove_file_self(&sess_dev->kobj, &attr->attr);

	rnbd_srv_destroy_dev_session_sysfs(sess_dev);