diff options
author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 17:34:08 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 17:43:17 -0400 |
commit | 495ac96e638cb0ad33baa7113531d742bfb328d4 (patch) | |
tree | 0a8289606d1bbe7b7aff552d61a7ba24216c1110 /fs/ocfs2 | |
parent | 3b3b84a892d37ba336391e411eb5f8b013b9a669 (diff) |
ocfs2: fix incorrect error returns
Use DLM_REJECTED instead of DLM_RECOVERING.
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index e3cab0e48503..d6f89577e25f 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/fs/ocfs2/dlm/dlmlock.c | |||
@@ -299,7 +299,7 @@ static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm, | |||
299 | if (tmpret >= 0) { | 299 | if (tmpret >= 0) { |
300 | // successfully sent and received | 300 | // successfully sent and received |
301 | ret = status; // this is already a dlm_status | 301 | ret = status; // this is already a dlm_status |
302 | if (ret == DLM_RECOVERING) { | 302 | if (ret == DLM_REJECTED) { |
303 | mlog(ML_ERROR, "%s:%.*s: BUG. this is a stale lockres " | 303 | mlog(ML_ERROR, "%s:%.*s: BUG. this is a stale lockres " |
304 | "no longer owned by %u. that node is coming back " | 304 | "no longer owned by %u. that node is coming back " |
305 | "up currently.\n", dlm->name, create.namelen, | 305 | "up currently.\n", dlm->name, create.namelen, |
@@ -457,7 +457,7 @@ int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data) | |||
457 | 457 | ||
458 | name = create->name; | 458 | name = create->name; |
459 | namelen = create->namelen; | 459 | namelen = create->namelen; |
460 | status = DLM_RECOVERING; | 460 | status = DLM_REJECTED; |
461 | if (!dlm_domain_fully_joined(dlm)) { | 461 | if (!dlm_domain_fully_joined(dlm)) { |
462 | mlog(ML_ERROR, "Domain %s not fully joined, but node %u is " | 462 | mlog(ML_ERROR, "Domain %s not fully joined, but node %u is " |
463 | "sending a create_lock message for lock %.*s!\n", | 463 | "sending a create_lock message for lock %.*s!\n", |