git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
[sfrench/cifs-2.6.git]
/
fs
/
lockd
/
clntproc.c
diff --git
a/fs/lockd/clntproc.c
b/fs/lockd/clntproc.c
index 50643b6a5556178be5f6b90a7d0c40afd01365db..497c3cd59d527c64055c21579930c7ec43fcfcd5 100644
(file)
--- a/
fs/lockd/clntproc.c
+++ b/
fs/lockd/clntproc.c
@@
-730,7
+730,7
@@
static void nlmclnt_cancel_callback(struct rpc_task *task, void *data)
goto retry_cancel;
}
- dprintk("lockd: cancel status %
d (task %d
)\n",
+ dprintk("lockd: cancel status %
u (task %u
)\n",
req->a_res.status, task->tk_pid);
switch (req->a_res.status) {