From 599d6399e659b469881a501f2871d63e3dfb5ccd Mon Sep 17 00:00:00 2001 From: adilger Date: Mon, 16 Aug 2004 20:36:24 +0000 Subject: [PATCH] Fix assertion problem at flock cleanup. b=4220 r=donm (original patch) --- lustre/ldlm/ldlm_flock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c index 800880c..3a8bd24 100644 --- a/lustre/ldlm/ldlm_flock.c +++ b/lustre/ldlm/ldlm_flock.c @@ -362,9 +362,11 @@ ldlm_process_flock_lock(struct ldlm_lock *req, int *flags, int first_enq, break; } + /* At this point we're granting the lock request. */ + req->l_granted_mode = req->l_req_mode; + /* Add req to the granted queue before calling ldlm_reprocess_all(). */ if (!added) { - req->l_granted_mode = req->l_req_mode; list_del_init(&req->l_res_link); /* insert new lock before ownlocks in list. */ ldlm_resource_add_lock(res, ownlocks, req); @@ -484,7 +486,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, int flags, void *data) spin_unlock_irqrestore(&imp->imp_lock, irqflags); } - lwi = LWI_TIMEOUT_INTR(0,NULL,ldlm_flock_interrupted_wait,&fwd); + lwi = LWI_TIMEOUT_INTR(0, NULL, ldlm_flock_interrupted_wait, &fwd); /* Go to sleep until the lock is granted. */ rc = l_wait_event(lock->l_waitq, -- 1.8.3.1