Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / fs / ocfs2 / dlm / dlmast.c

diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
index 644bee5..81eff8e 100644 (file)
--- a/fs/ocfs2/dlm/dlmast.c
+++ b/fs/ocfs2/dlm/dlmast.c
@@ -103,7 +103,6 @@ static void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
                     lock->ast_pending, lock->ml.type);
                BUG();
        }
-       BUG_ON(!list_empty(&lock->ast_list));
        if (lock->ast_pending)
                mlog(0, "lock has an ast getting flushed right now\n");
 
@@ -275,6 +274,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
        struct list_head *iter, *head=NULL;
        u64 cookie;
        u32 flags;
+       u8 node;
 
        if (!dlm_grab(dlm)) {
                dlm_error(DLM_REJECTED);
@@ -286,18 +286,21 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
 
        name = past->name;
        locklen = past->namelen;
-       cookie = be64_to_cpu(past->cookie);
+       cookie = past->cookie;
        flags = be32_to_cpu(past->flags);
+       node = past->node_idx;
 
        if (locklen > DLM_LOCKID_NAME_MAX) {
                ret = DLM_IVBUFLEN;
-               mlog(ML_ERROR, "Invalid name length in proxy ast handler!\n");
+               mlog(ML_ERROR, "Invalid name length (%d) in proxy ast "
+                    "handler!\n", locklen);
                goto leave;
        }
 
        if ((flags & (LKM_PUT_LVB|LKM_GET_LVB)) ==
             (LKM_PUT_LVB|LKM_GET_LVB)) {
-               mlog(ML_ERROR, "both PUT and GET lvb specified\n");
+               mlog(ML_ERROR, "Both PUT and GET lvb specified, (0x%x)\n",
+                    flags);
                ret = DLM_BADARGS;
                goto leave;
        }
@@ -310,22 +313,21 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
        if (past->type != DLM_AST &&
            past->type != DLM_BAST) {
                mlog(ML_ERROR, "Unknown ast type! %d, cookie=%u:%llu"
-                    "name=%.*s\n", past->type, 
-                    dlm_get_lock_cookie_node(cookie),
-                    dlm_get_lock_cookie_seq(cookie),
-                    locklen, name);
+                    "name=%.*s, node=%u\n", past->type,
+                    dlm_get_lock_cookie_node(be64_to_cpu(cookie)),
+                    dlm_get_lock_cookie_seq(be64_to_cpu(cookie)),
+                    locklen, name, node);
                ret = DLM_IVLOCKID;
                goto leave;
        }
 
        res = dlm_lookup_lockres(dlm, name, locklen);
        if (!res) {
-               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),
-                    locklen, name, locklen);
+               mlog(0, "Got %sast for unknown lockres! cookie=%u:%llu, "
+                    "name=%.*s, node=%u\n", (past->type == DLM_AST ? "" : "b"),
+                    dlm_get_lock_cookie_node(be64_to_cpu(cookie)),
+                    dlm_get_lock_cookie_seq(be64_to_cpu(cookie)),
+                    locklen, name, node);
                ret = DLM_IVLOCKID;
                goto leave;
        }
@@ -337,12 +339,12 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
 
        spin_lock(&res->spinlock);
        if (res->state & DLM_LOCK_RES_RECOVERING) {
-               mlog(0, "responding with DLM_RECOVERING!\n");
+               mlog(0, "Responding with DLM_RECOVERING!\n");
                ret = DLM_RECOVERING;
                goto unlock_out;
        }
        if (res->state & DLM_LOCK_RES_MIGRATING) {
-               mlog(0, "responding with DLM_MIGRATING!\n");
+               mlog(0, "Responding with DLM_MIGRATING!\n");
                ret = DLM_MIGRATING;
                goto unlock_out;
        }
@@ -351,7 +353,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
        lock = NULL;
        list_for_each(iter, head) {
                lock = list_entry (iter, struct dlm_lock, list);
-               if (be64_to_cpu(lock->ml.cookie) == cookie)
+               if (lock->ml.cookie == cookie)
                        goto do_ast;
        }
 
@@ -363,15 +365,15 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
 
        list_for_each(iter, head) {
                lock = list_entry (iter, struct dlm_lock, list);
-               if (be64_to_cpu(lock->ml.cookie) == cookie)
+               if (lock->ml.cookie == cookie)
                        goto do_ast;
        }
 
-       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),
-            locklen, name, locklen);
+       mlog(0, "Got %sast for unknown lock! cookie=%u:%llu, name=%.*s, "
+            "node=%u\n", past->type == DLM_AST ? "" : "b",
+            dlm_get_lock_cookie_node(be64_to_cpu(cookie)),
+            dlm_get_lock_cookie_seq(be64_to_cpu(cookie)),
+            locklen, name, node);
 
        ret = DLM_NORMAL;
 unlock_out:
@@ -383,8 +385,8 @@ do_ast:
        if (past->type == DLM_AST) {
                /* do not alter lock refcount.  switching lists. */
                list_move_tail(&lock->list, &res->granted);
-               mlog(0, "ast: adding to granted list... type=%d, "
-                         "convert_type=%d\n", lock->ml.type, lock->ml.convert_type);
+               mlog(0, "ast: Adding to granted list... type=%d, "
+                    "convert_type=%d\n", lock->ml.type, lock->ml.convert_type);
                if (lock->ml.convert_type != LKM_IVMODE) {
                        lock->ml.type = lock->ml.convert_type;
                        lock->ml.convert_type = LKM_IVMODE;
@@ -408,7 +410,6 @@ do_ast:
                dlm_do_local_bast(dlm, res, lock, past->blocked_type);
 
 leave:
-
        if (res)
                dlm_lockres_put(res);