From: Ilya Dryomov Date: Tue, 23 Jul 2024 16:08:08 +0000 (+0200) Subject: rbd: don't assume rbd_is_lock_owner() for exclusive mappings X-Git-Tag: v6.12~812^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ceccb14f5576e02b81cc8b105ab81f224bd87f6;p=platform%2Fkernel%2Flinux-amlogic.git 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 Reviewed-by: Dongsheng Yang --- 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; }