granted lock is moved to HELD state in cl_wait_try() only which is
done after upcall for non-agl locks. as the result, lock unuse moves
cl_lock not to CACHED state, but to NEW state. A parallel thread
gets this lock and tries to enqueue it - instead of re-using a
cached lock, cl_enqueue_try() initiates a new enqueue and gets to
osc_lock_enqueue() where it asserts:
LASSERTF(ols->ols_state == OLS_NEW, ...);
the state of osc lock is RELEASED already - moved here by unuse.
Signed-off-by: Vitaly Fertman <vitaly_fertman@xyratex.com>
Change-Id: I611a6e8778871da184db13434d223036625443c8
Reviewed-on: http://review.whamcloud.com/6709
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lock->cll_flags |= CLF_FROM_UPCALL;
cl_wait_try(env, lock);
lock->cll_flags &= ~CLF_FROM_UPCALL;
lock->cll_flags |= CLF_FROM_UPCALL;
cl_wait_try(env, lock);
lock->cll_flags &= ~CLF_FROM_UPCALL;
- if (!olck->ols_glimpse)
- olck->ols_agl = 0;
}
cl_lock_signal(env, lock);
/* del user for lock upcall cookie */
}
cl_lock_signal(env, lock);
/* del user for lock upcall cookie */
- cl_unuse_try(env, lock);
+ if (olck->ols_agl) {
+ if (!olck->ols_glimpse)
+ olck->ols_agl = 0;
+ cl_unuse_try(env, lock);
+ }
} else {
/* del user for lock upcall cookie */
} else {
/* del user for lock upcall cookie */
- cl_lock_user_del(env, lock);
+ if (olck->ols_agl)
+ cl_lock_user_del(env, lock);
cl_lock_error(env, lock, rc);
}
cl_lock_error(env, lock, rc);
}
/* lock will be passed as upcall cookie,
* hold ref to prevent to be released. */
cl_lock_hold_add(env, lock, "upcall", lock);
/* lock will be passed as upcall cookie,
* hold ref to prevent to be released. */
cl_lock_hold_add(env, lock, "upcall", lock);
- /* a user for lock also */
- cl_lock_user_add(env, lock);
+ /* a user for agl lock also */
+ if (ols->ols_agl)
+ cl_lock_user_add(env, lock);
ols->ols_state = OLS_ENQUEUED;
/*
ols->ols_state = OLS_ENQUEUED;
/*
ols, einfo, &ols->ols_handle,
PTLRPCD_SET, 1, ols->ols_agl);
if (result != 0) {
ols, einfo, &ols->ols_handle,
PTLRPCD_SET, 1, ols->ols_agl);
if (result != 0) {
- cl_lock_user_del(env, lock);
+ if (ols->ols_agl)
+ cl_lock_user_del(env, lock);
cl_lock_unhold(env, lock, "upcall", lock);
if (unlikely(result == -ECANCELED)) {
ols->ols_state = OLS_NEW;
cl_lock_unhold(env, lock, "upcall", lock);
if (unlikely(result == -ECANCELED)) {
ols->ols_state = OLS_NEW;