diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2024-07-23 18:08:08 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2024-07-25 12:18:29 +0200 |
| commit | 3ceccb14f5576e02b81cc8b105ab81f224bd87f6 (patch) | |
| tree | 6a1f2f51a0ac2adea4254265f1eedb525cb9e320 | |
| parent | 2237ceb71f89837ac47c5dce2aaa2c2b3a337a3c (diff) | |
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
Expanding on the previous commit, assuming that rbd_is_lock_owner()
always returns true (i.e. that we are either in RBD_LOCK_STATE_LOCKED
or RBD_LOCK_STATE_QUIESCING) if the mapping is exclusive is wrong too.
In case ceph_cls_set_cookie() fails, the lock would be temporarily
released even if the mapping is exclusive, meaning that we can end up
even in RBD_LOCK_STATE_UNLOCKED.
IOW, exclusive mappings are really "just" about disabling automatic
lock transitions (as documented in the man page), not about grabbing
the lock and holding on to it whatever it takes.
Cc: stable@vger.kernel.org
Fixes: 637cd060537d ("rbd: new exclusive lock wait/wake code")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
| -rw-r--r-- | drivers/block/rbd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ea6c592e015c..da22ce38c039 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -6589,11 +6589,6 @@ static int rbd_add_acquire_lock(struct rbd_device *rbd_dev) if (ret) return ret; - /* - * The lock may have been released by now, unless automatic lock - * transitions are disabled. - */ - rbd_assert(!rbd_dev->opts->exclusive || rbd_is_lock_owner(rbd_dev)); return 0; } |