git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmrecovery.c
diff --git
a/fs/ocfs2/dlm/dlmrecovery.c
b/fs/ocfs2/dlm/dlmrecovery.c
index
bcb9260
..
43e6e32
100644
(file)
--- a/
fs/ocfs2/dlm/dlmrecovery.c
+++ b/
fs/ocfs2/dlm/dlmrecovery.c
@@
-1118,7
+1118,7
@@
static int dlm_send_mig_lockres_msg(struct dlm_ctxt *dlm,
mlog(0, "%s:%.*s: sending mig lockres (%s) to %u\n",
dlm->name, res->lockname.len, res->lockname.name,
- orig_flags & DLM_MRES_MIGRATION ? "migrat
e
" : "recovery",
+ orig_flags & DLM_MRES_MIGRATION ? "migrat
ion
" : "recovery",
send_to);
/* send it */