X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Ffile.c;h=a96286f59d3875fed174a5dfe6796a1dc144304f;hp=6f25a6a82e3d866c2e92086233a22c3211c57bd8;hb=1b166d6dd6a2f39dfe35b60be169b288665d0283;hpb=4c2514f4832801374092f3a48c755248af345566

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);