Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / dlm / dlmast.c

diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
index f13a4bac41f0c379a5d5b1eb3034c675f4bc7eab..2fd8bded38f31391c5aa80c2ec36c01874bf4572 100644 (file)
--- a/fs/ocfs2/dlm/dlmast.c
+++ b/fs/ocfs2/dlm/dlmast.c
@@ -263,7 +263,8 @@ void dlm_do_local_bast(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
 
 
 
-int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data)
+int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
+                         void **ret_data)
 {
        int ret;
        unsigned int locklen;
@@ -320,8 +321,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),
@@ -369,7 +370,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data)
 
        mlog(0, "got %sast for unknown lock!  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),
+            dlm_get_lock_cookie_node(cookie),
+            dlm_get_lock_cookie_seq(cookie),
             locklen, name, locklen);
 
        ret = DLM_NORMAL;
@@ -462,7 +464,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 */