diff --git a/[refs] b/[refs] index 29a665ce2e20..8b225a27938e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3156d267016627fe427a6b0d4ed8a9678557e91e +refs/heads/master: 0032abd674a606c3cf2d9961c8119f5d72c411d0 diff --git a/trunk/fs/ocfs2/dlm/dlmunlock.c b/trunk/fs/ocfs2/dlm/dlmunlock.c index 9b40d60e3b49..b0c3134f4f70 100644 --- a/trunk/fs/ocfs2/dlm/dlmunlock.c +++ b/trunk/fs/ocfs2/dlm/dlmunlock.c @@ -317,7 +317,7 @@ 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