]> err.no Git - linux-2.6/commitdiff
ocfs2: Silence dlm error print
authorMark Fasheh <mark.fasheh@oracle.com>
Fri, 8 Sep 2006 18:37:32 +0000 (11:37 -0700)
committerMark Fasheh <mark.fasheh@oracle.com>
Sun, 24 Sep 2006 20:50:41 +0000 (13:50 -0700)
An AST can be delivered via the network after a lock has been removed, so no
need to print an error when we see that.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
fs/ocfs2/dlm/dlmast.c

index f13a4bac41f0c379a5d5b1eb3034c675f4bc7eab..681046d51393ba3d3dad17c137ed1d4e42e590d7 100644 (file)
@@ -320,8 +320,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data)
 
        res = dlm_lookup_lockres(dlm, name, locklen);
        if (!res) {
-               mlog(ML_ERROR, "got %sast for unknown lockres! "
-                              "cookie=%u:%llu, name=%.*s, namelen=%u\n",
+               mlog(0, "got %sast for unknown lockres! "
+                    "cookie=%u:%llu, name=%.*s, namelen=%u\n",
                     past->type == DLM_AST ? "" : "b",
                     dlm_get_lock_cookie_node(cookie),
                     dlm_get_lock_cookie_seq(cookie),
@@ -462,7 +462,7 @@ int dlm_send_proxy_ast_msg(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
                        mlog(ML_ERROR, "sent AST to node %u, it returned "
                             "DLM_MIGRATING!\n", lock->ml.node);
                        BUG();
-               } else if (status != DLM_NORMAL) {
+               } else if (status != DLM_NORMAL && status != DLM_IVLOCKID) {
                        mlog(ML_ERROR, "AST to node %u returned %d!\n",
                             lock->ml.node, status);
                        /* ignore it */