From 4990f4ef5eb81d8017c9992c1f6924527dc8ce60 Mon Sep 17 00:00:00 2001 From: Bobi Jam Date: Thu, 8 Dec 2022 00:03:20 +0800 Subject: [PATCH] LU-16371 ldlm: clear lock converting flag on resource cleanup During resource cleanup clear lock's converting flag so that ldlm_cli_cancel() won't erroneously trip the assertion, the assertion is used for normal lock revoke callbacks. Signed-off-by: Bobi Jam Change-Id: I1be4d7f16dbc7e026b460fd5358a0fe509b97a59 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49339 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin --- lustre/ldlm/ldlm_resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index 155406e..47b40d1 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -1056,6 +1056,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, * can match this lock. */ ldlm_set_cbpending(lock); ldlm_set_failed(lock); + ldlm_clear_converting(lock); lock->l_flags |= flags; /* ... without sending a CANCEL message for local_only. */ -- 1.8.3.1