From c80b2f9ac1042f08eb3bc745ecc83ec51cc6a264 Mon Sep 17 00:00:00 2001 From: Kurt Hackel Date: Mon, 1 May 2006 14:34:08 -0700 Subject: [PATCH] --- yaml --- r: 30705 b: refs/heads/master c: 495ac96e638cb0ad33baa7113531d742bfb328d4 h: refs/heads/master i: 30703: 9b15742e8a3a851680ad06d1238cbbf703a2c9cb v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmlock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 17b500e696dd..08c736a958d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b3b84a892d37ba336391e411eb5f8b013b9a669 +refs/heads/master: 495ac96e638cb0ad33baa7113531d742bfb328d4 diff --git a/trunk/fs/ocfs2/dlm/dlmlock.c b/trunk/fs/ocfs2/dlm/dlmlock.c index e3cab0e48503..d6f89577e25f 100644 --- a/trunk/fs/ocfs2/dlm/dlmlock.c +++ b/trunk/fs/ocfs2/dlm/dlmlock.c @@ -299,7 +299,7 @@ static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm, if (tmpret >= 0) { // successfully sent and received ret = status; // this is already a dlm_status - if (ret == DLM_RECOVERING) { + if (ret == DLM_REJECTED) { mlog(ML_ERROR, "%s:%.*s: BUG. this is a stale lockres " "no longer owned by %u. that node is coming back " "up currently.\n", dlm->name, create.namelen, @@ -457,7 +457,7 @@ int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data) name = create->name; namelen = create->namelen; - status = DLM_RECOVERING; + status = DLM_REJECTED; if (!dlm_domain_fully_joined(dlm)) { mlog(ML_ERROR, "Domain %s not fully joined, but node %u is " "sending a create_lock message for lock %.*s!\n",