From 2d8062e0055a7558369264c3f8fc30b38d58f432 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 8 Aug 2003 06:43:09 +0000 Subject: [PATCH] Land fix for bug 1558 on HEAD. r=phil,shaver --- lustre/mds/handler.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index 756e290..fd46c4f 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -1852,10 +1852,12 @@ static int ldlm_intent_policy(struct ldlm_namespace *ns, * have one reader _or_ writer ref (which will be zeroed below * before returning the lock to a client. */ - if (new_lock->l_export == req->rq_export) + if (new_lock->l_export == req->rq_export) { LASSERT(new_lock->l_readers + new_lock->l_writers == 0); - else + } else { + LASSERT(new_lock->l_export == NULL); LASSERT(new_lock->l_readers + new_lock->l_writers == 1); + } /* If we're running an intent only, we want to abort the new * lock, and let the client abort the original lock. */ @@ -1888,7 +1890,7 @@ static int ldlm_intent_policy(struct ldlm_namespace *ns, new_lock->l_readers = 0; new_lock->l_writers = 0; - new_lock->l_export = req->rq_export; + new_lock->l_export = class_export_get(req->rq_export); list_add(&new_lock->l_export_chain, &new_lock->l_export->exp_ldlm_data.led_held_locks); -- 1.8.3.1