|
@@ -2549,7 +2549,7 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
|
|
}
|
|
}
|
|
|
|
|
|
fail:
|
|
fail:
|
|
- if (oldmle) {
|
|
|
|
|
|
+ if (ret != -EEXIST && oldmle) {
|
|
/* master is known, detach if not already detached */
|
|
/* master is known, detach if not already detached */
|
|
dlm_mle_detach_hb_events(dlm, oldmle);
|
|
dlm_mle_detach_hb_events(dlm, oldmle);
|
|
dlm_put_mle(oldmle);
|
|
dlm_put_mle(oldmle);
|
|
@@ -3136,7 +3136,8 @@ static int dlm_add_migration_mle(struct dlm_ctxt *dlm,
|
|
mlog(0, "tried to migrate %.*s, but some "
|
|
mlog(0, "tried to migrate %.*s, but some "
|
|
"process beat me to it\n",
|
|
"process beat me to it\n",
|
|
namelen, name);
|
|
namelen, name);
|
|
- ret = -EEXIST;
|
|
|
|
|
|
+ spin_unlock(&tmp->spinlock);
|
|
|
|
+ return -EEXIST;
|
|
} else {
|
|
} else {
|
|
/* bad. 2 NODES are trying to migrate! */
|
|
/* bad. 2 NODES are trying to migrate! */
|
|
mlog(ML_ERROR, "migration error mle: "
|
|
mlog(ML_ERROR, "migration error mle: "
|