From 4b8a0c4fe85f908a1bda7eb8a977460df1ccfa54 Mon Sep 17 00:00:00 2001 From: green Date: Tue, 5 Jul 2005 08:32:23 +0000 Subject: [PATCH] Branch: b1_4 Added forgotten comment and assertion from grouplock code. --- lustre/ldlm/ldlm_extent.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c index ec35e3f..1422e53 100644 --- a/lustre/ldlm/ldlm_extent.c +++ b/lustre/ldlm/ldlm_extent.c @@ -318,6 +318,12 @@ int ldlm_process_extent_lock(struct ldlm_lock *lock, int *flags, int first_enq, *err = ELDLM_OK; if (!first_enq) { + /* Careful observers will note that we don't handle -EWOULDBLOCK + * here, but it's ok for a non-obvious reason -- compat_queue + * can only return -EWOULDBLOCK if (flags & BLOCK_NOWAIT). + * flags should always be zero here, and if that ever stops + * being true, we want to find out. */ + LASSERT(*flags == 0); LASSERT(res->lr_tmp != NULL); rc = ldlm_extent_compat_queue(&res->lr_granted, lock, 0, flags, err); -- 1.8.3.1