Skip to content

L
linux-davinci-2.6.23
Commit a7d25539 authored by Mark Fasheh's avatar Mark Fasheh
Browse files
Options

ocfs2: fix sparse warnings in fs/ocfs2/dlm 

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 1ca1a111
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
fs/ocfs2/dlm/dlmast.c
View file @ a7d25539
...@@ -312,8 +312,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, ...@@ -312,8 +312,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
past->type != DLM_BAST) { past->type != DLM_BAST) {
mlog(ML_ERROR, "Unknown ast type! %d, cookie=%u:%llu" mlog(ML_ERROR, "Unknown ast type! %d, cookie=%u:%llu"
"name=%.*s\n", past->type, "name=%.*s\n", past->type,
dlm_get_lock_cookie_node(be64_to_cpu(cookie)), dlm_get_lock_cookie_node(cookie),
dlm_get_lock_cookie_seq(be64_to_cpu(cookie)), dlm_get_lock_cookie_seq(cookie),
locklen, name); locklen, name);
ret = DLM_IVLOCKID; ret = DLM_IVLOCKID;
goto leave; goto leave;
...@@ -324,8 +324,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, ...@@ -324,8 +324,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
mlog(0, "got %sast for unknown lockres! " mlog(0, "got %sast for unknown lockres! "
"cookie=%u:%llu, name=%.*s, namelen=%u\n", "cookie=%u:%llu, name=%.*s, namelen=%u\n",
past->type == DLM_AST ? "" : "b", past->type == DLM_AST ? "" : "b",
dlm_get_lock_cookie_node(be64_to_cpu(cookie)), dlm_get_lock_cookie_node(cookie),
dlm_get_lock_cookie_seq(be64_to_cpu(cookie)), dlm_get_lock_cookie_seq(cookie),
locklen, name, locklen); locklen, name, locklen);
ret = DLM_IVLOCKID; ret = DLM_IVLOCKID;
goto leave; goto leave;
...@@ -370,8 +370,8 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, ...@@ -370,8 +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, " mlog(0, "got %sast for unknown lock! cookie=%u:%llu, "
"name=%.*s, namelen=%u\n", past->type == DLM_AST ? "" : "b", "name=%.*s, namelen=%u\n", past->type == DLM_AST ? "" : "b",
dlm_get_lock_cookie_node(be64_to_cpu(cookie)), dlm_get_lock_cookie_node(cookie),
dlm_get_lock_cookie_seq(be64_to_cpu(cookie)), dlm_get_lock_cookie_seq(cookie),
locklen, name, locklen); locklen, name, locklen);
ret = DLM_NORMAL; ret = DLM_NORMAL;
......
fs/ocfs2/dlm/dlmrecovery.c
View file @ a7d25539
...@@ -1769,7 +1769,7 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm, ...@@ -1769,7 +1769,7 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm,
/* lock is always created locally first, and /* lock is always created locally first, and
* destroyed locally last. it must be on the list */ * destroyed locally last. it must be on the list */
if (!lock) { if (!lock) {
u64 c = ml->cookie; __be64 c = ml->cookie;
mlog(ML_ERROR, "could not find local lock " mlog(ML_ERROR, "could not find local lock "
"with cookie %u:%llu!\n", "with cookie %u:%llu!\n",
dlm_get_lock_cookie_node(be64_to_cpu(c)), dlm_get_lock_cookie_node(be64_to_cpu(c)),
...@@ -1878,7 +1878,7 @@ skip_lvb: ...@@ -1878,7 +1878,7 @@ skip_lvb:
spin_lock(&res->spinlock); spin_lock(&res->spinlock);
list_for_each_entry(lock, queue, list) { list_for_each_entry(lock, queue, list) {
if (lock->ml.cookie == ml->cookie) { if (lock->ml.cookie == ml->cookie) {
u64 c = lock->ml.cookie; __be64 c = lock->ml.cookie;
mlog(ML_ERROR, "%s:%.*s: %u:%llu: lock already " mlog(ML_ERROR, "%s:%.*s: %u:%llu: lock already "
"exists on this lockres!\n", dlm->name, "exists on this lockres!\n", dlm->name,
res->lockname.len, res->lockname.name, res->lockname.len, res->lockname.name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment