aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-04-27 17:59:46 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2006-06-26 14:42:45 -0700
commit2580a580e029f9a59a66cd230b1fd7e2d9ee339d (patch)
tree320baf22e8a0ee1d03d256edadd37a49aef39ae1
parent8d79d088e88198d5456861ee9e6a8226dcd08799 (diff)
ocfs2: recheck lockres master before sending an unlock request.
Recovery may have happened and it may now be mastered locally. Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
-rw-r--r--fs/ocfs2/dlm/dlmunlock.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c
index ac89c509daf..9b40d60e3b4 100644
--- a/fs/ocfs2/dlm/dlmunlock.c
+++ b/fs/ocfs2/dlm/dlmunlock.c
@@ -317,6 +317,16 @@ static enum dlm_status dlm_send_remote_unlock_request(struct dlm_ctxt *dlm,
size_t veclen = 1;
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;