From: Bobi Jam <bobijam@whamcloud.com>
Date: Fri, 4 Jun 2021 03:58:29 +0000 (+0800)
Subject: LU-14780 llite: failed ASSERTION(ldlm_has_layout(lock))
X-Git-Tag: 2.14.53~48
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F44054%2F2;p=fs%2Flustre-release.git

LU-14780 llite: failed ASSERTION(ldlm_has_layout(lock))

When setting layout in layout lock, the lock could lost its layout
bits, and we'd try fetch the layout lock again.

Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: I10f96e4cb03cfe228d3c1ea1500b1a8d8e4e5e54
Reviewed-on: https://review.whamcloud.com/44054
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yingjin Qian <qian@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 6f25a6a..a96286f 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -5754,7 +5754,9 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode,
 
 	lock = ldlm_handle2lock(lockh);
 	LASSERT(lock != NULL);
-	LASSERT(ldlm_has_layout(lock));
+
+	if (!ldlm_has_layout(lock))
+		GOTO(out, rc = -EAGAIN);
 
 	LDLM_DEBUG(lock, "file "DFID"(%p) being reconfigured",
 		   PFID(&lli->lli_fid), inode);