diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 20:15:41 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 20:15:41 +0100 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /fs/ocfs2/dlm/dlmconvert.c | |
| parent | [CIFS] cifs: replace remaining __FUNCTION__ occurrences (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86... (diff) | |
| download | linux-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.tar.xz linux-5b4d4771e2a56671c7f1c94edda427a1e3d6f111.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2/dlm/dlmconvert.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c index ecb4d997221e..75997b4deaf3 100644 --- a/fs/ocfs2/dlm/dlmconvert.c +++ b/fs/ocfs2/dlm/dlmconvert.c @@ -487,7 +487,7 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data, "cookie=%u:%llu\n", dlm_get_lock_cookie_node(be64_to_cpu(cnv->cookie)), dlm_get_lock_cookie_seq(be64_to_cpu(cnv->cookie))); - __dlm_print_one_lock_resource(res); + dlm_print_one_lock_resource(res); goto leave; } |