[Ocfs2-commits] mfasheh commits r2702 -
branches/ocfs2-1.2/fs/ocfs2/dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Nov 17 14:31:50 CST 2005
Author: mfasheh
Signed-off-by: khackel
Date: 2005-11-17 14:31:48 -0600 (Thu, 17 Nov 2005)
New Revision: 2702
Modified:
branches/ocfs2-1.2/fs/ocfs2/dlm/dlmlock.c
Log:
* backport svn r2700 from trunk:
- filter some DLM_NOTQUEUED error messages
Signed-off-by: khackel
Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmlock.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmlock.c 2005-11-17 20:27:07 UTC (rev 2701)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmlock.c 2005-11-17 20:31:48 UTC (rev 2702)
@@ -215,7 +215,8 @@
res->state &= ~DLM_LOCK_RES_IN_PROGRESS;
lock->lock_pending = 0;
if (status != DLM_NORMAL) {
- dlm_error(status);
+ if (status != DLM_NOTQUEUED)
+ dlm_error(status);
dlm_revert_pending_lock(res, lock);
dlm_lock_put(lock);
}
@@ -650,7 +651,8 @@
if (status != DLM_NORMAL) {
lock->lksb->flags &= ~DLM_LKSB_GET_LVB;
- dlm_error(status);
+ if (status != DLM_NOTQUEUED)
+ dlm_error(status);
goto error;
}
}
More information about the Ocfs2-commits
mailing list