diff options
| author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 14:34:08 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 14:43:17 -0700 |
| commit | 495ac96e638cb0ad33baa7113531d742bfb328d4 (patch) | |
| tree | 0a8289606d1bbe7b7aff552d61a7ba24216c1110 /fs | |
| parent | 3b3b84a892d37ba336391e411eb5f8b013b9a669 (diff) | |
| download | linux-3.10-495ac96e638cb0ad33baa7113531d742bfb328d4.tar.gz linux-3.10-495ac96e638cb0ad33baa7113531d742bfb328d4.tar.bz2 linux-3.10-495ac96e638cb0ad33baa7113531d742bfb328d4.zip | |
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')
| -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 e3cab0e4850..d6f89577e25 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, 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", |