diff options
| author | Mark Brown <broonie@kernel.org> | 2021-01-13 17:57:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-01-13 17:57:07 +0000 |
| commit | c2fa56173ba66bab8f0005789c383cb8cc2aaf62 (patch) | |
| tree | c9f6e3b373e11fee60fa16743576433d8bbb32c7 /drivers/block/rnbd/rnbd-srv.c | |
| parent | 3acb64c07e95a75dc0af0bc958f2d09a44a9fd0d (diff) | |
| parent | 7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff) | |
| download | linux-c2fa56173ba66bab8f0005789c383cb8cc2aaf62.tar.gz | |
Merge v5.11-rc3
Diffstat (limited to 'drivers/block/rnbd/rnbd-srv.c')
| -rw-r--r-- | drivers/block/rnbd/rnbd-srv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c index b8e44331e494..a6a68d44f517 100644 --- a/drivers/block/rnbd/rnbd-srv.c +++ b/drivers/block/rnbd/rnbd-srv.c @@ -338,10 +338,12 @@ static int rnbd_srv_link_ev(struct rtrs_srv *rtrs, void rnbd_srv_sess_dev_force_close(struct rnbd_srv_sess_dev *sess_dev) { - mutex_lock(&sess_dev->sess->lock); - rnbd_srv_destroy_dev_session_sysfs(sess_dev); - mutex_unlock(&sess_dev->sess->lock); + struct rnbd_srv_session *sess = sess_dev->sess; + sess_dev->keep_id = true; + mutex_lock(&sess->lock); + rnbd_srv_destroy_dev_session_sysfs(sess_dev); + mutex_unlock(&sess->lock); } static int process_msg_close(struct rtrs_srv *rtrs, |