else
status = dlm_get_unlock_actions(dlm, res, lock, lksb, &actions);
- if (status != DLM_NORMAL && (status != DLM_CANCELGRANT || !master_node))
+ if (status != DLM_NORMAL)
goto leave;
/* By now this has been masked out of cancel requests. */
spin_lock(&lock->spinlock);
/* if the master told us the lock was already granted,
* let the ast handle all of these actions */
- if (status == DLM_CANCELGRANT) {
+ if (status == DLM_NORMAL &&
+ lksb->status == DLM_CANCELGRANT) {
actions &= ~(DLM_UNLOCK_REMOVE_LOCK|
DLM_UNLOCK_REGRANT_LOCK|
DLM_UNLOCK_CLEAR_CONVERT_TYPE);
if (actions & DLM_UNLOCK_FREE_LOCK) {
/* this should always be coupled with list removal */
BUG_ON(!(actions & DLM_UNLOCK_REMOVE_LOCK));
- mlog(0, "lock %u:%llu should be gone now! refs=%d\n",
- dlm_get_lock_cookie_node(lock->ml.cookie),
- dlm_get_lock_cookie_seq(lock->ml.cookie),
- atomic_read(&lock->lock_refs.refcount)-1);
+ mlog(0, "lock %"MLFu64" should be gone now! refs=%d\n",
+ lock->ml.cookie, atomic_read(&lock->lock_refs.refcount)-1);
dlm_lock_put(lock);
}
if (actions & DLM_UNLOCK_CALL_AST)
void dlm_commit_pending_cancel(struct dlm_lock_resource *res,
struct dlm_lock *lock)
{
- list_move_tail(&lock->list, &res->granted);
+ list_del_init(&lock->list);
+ list_add_tail(&lock->list, &res->granted);
lock->ml.convert_type = LKM_IVMODE;
}
mlog_entry("%.*s\n", res->lockname.len, res->lockname.name);
- if (owner == dlm->node_num) {
- /* ended up trying to contact ourself. this means
- * that the lockres had been remote but became local
- * via a migration. just retry it, now as local */
- mlog(0, "%s:%.*s: this node became the master due to a "
- "migration, re-evaluate now\n", dlm->name,
- res->lockname.len, res->lockname.name);
- return DLM_FORWARD;
- }
-
memset(&unlock, 0, sizeof(unlock));
unlock.node_idx = dlm->node_num;
unlock.flags = cpu_to_be32(flags);
vec, veclen, owner, &status);
if (tmpret >= 0) {
// successfully sent and received
- if (status == DLM_FORWARD)
+ if (status == DLM_CANCELGRANT)
+ ret = DLM_NORMAL;
+ else if (status == DLM_FORWARD) {
mlog(0, "master was in-progress. retry\n");
- ret = status;
+ ret = DLM_FORWARD;
+ } else
+ ret = status;
+ lksb->status = status;
} else {
mlog_errno(tmpret);
if (dlm_is_host_down(tmpret)) {
/* something bad. this will BUG in ocfs2 */
ret = dlm_err_to_dlm_status(tmpret);
}
+ lksb->status = ret;
}
return ret;
/* lock was found on queue */
lksb = lock->lksb;
- if (flags & (LKM_VALBLK|LKM_PUT_LVB) &&
- lock->ml.type != LKM_EXMODE)
- flags &= ~(LKM_VALBLK|LKM_PUT_LVB);
-
/* unlockast only called on originating node */
if (flags & LKM_PUT_LVB) {
lksb->flags |= DLM_LKSB_PUT_LVB;
not_found:
if (!found)
mlog(ML_ERROR, "failed to find lock to unlock! "
- "cookie=%u:%llu\n",
- dlm_get_lock_cookie_node(unlock->cookie),
- dlm_get_lock_cookie_seq(unlock->cookie));
- else
+ "cookie=%"MLFu64"\n",
+ unlock->cookie);
+ else {
+ /* send the lksb->status back to the other node */
+ status = lksb->status;
dlm_lock_put(lock);
+ }
leave:
if (res)
if (dlm_lock_on_list(&res->blocked, lock)) {
/* cancel this outright */
+ lksb->status = DLM_NORMAL;
status = DLM_NORMAL;
*actions = (DLM_UNLOCK_CALL_AST |
DLM_UNLOCK_REMOVE_LOCK);
} else if (dlm_lock_on_list(&res->converting, lock)) {
/* cancel the request, put back on granted */
+ lksb->status = DLM_NORMAL;
status = DLM_NORMAL;
*actions = (DLM_UNLOCK_CALL_AST |
DLM_UNLOCK_REMOVE_LOCK |
DLM_UNLOCK_REGRANT_LOCK |
DLM_UNLOCK_CLEAR_CONVERT_TYPE);
} else if (dlm_lock_on_list(&res->granted, lock)) {
- /* too late, already granted. */
- status = DLM_CANCELGRANT;
+ /* too late, already granted. DLM_CANCELGRANT */
+ lksb->status = DLM_CANCELGRANT;
+ status = DLM_NORMAL;
*actions = DLM_UNLOCK_CALL_AST;
} else {
mlog(ML_ERROR, "lock to cancel is not on any list!\n");
+ lksb->status = DLM_IVLOCKID;
status = DLM_IVLOCKID;
*actions = 0;
}
/* unlock request */
if (!dlm_lock_on_list(&res->granted, lock)) {
+ lksb->status = DLM_DENIED;
status = DLM_DENIED;
dlm_error(status);
*actions = 0;
} else {
/* unlock granted lock */
+ lksb->status = DLM_NORMAL;
status = DLM_NORMAL;
*actions = (DLM_UNLOCK_FREE_LOCK |
DLM_UNLOCK_CALL_AST |
spin_lock(&res->spinlock);
is_master = (res->owner == dlm->node_num);
- if (flags & LKM_VALBLK && lock->ml.type != LKM_EXMODE)
- flags &= ~LKM_VALBLK;
spin_unlock(&res->spinlock);
if (is_master) {
}
if (call_ast) {
- mlog(0, "calling unlockast(%p, %d)\n", data, status);
+ mlog(0, "calling unlockast(%p, %d)\n", data, lksb->status);
if (is_master) {
/* it is possible that there is one last bast
* pending. make sure it is flushed, then
wait_event(dlm->ast_wq,
dlm_lock_basts_flushed(dlm, lock));
}
- (*unlockast)(data, status);
+ (*unlockast)(data, lksb->status);
}
- if (status == DLM_CANCELGRANT)
- status = DLM_NORMAL;
-
if (status == DLM_NORMAL) {
mlog(0, "kicking the thread\n");
dlm_kick_thread(dlm, res);
git://git.onelab.eu / linux-2.6.git / blobdiff