dlm: Make dismatch error message more clear

This change will try to make this error message more clear,
since the upper applications (e.g. ocfs2) invoke dlm_new_lockspace
to create a new lockspace with passing a cluster name. Sometimes,
dlm_new_lockspace return failure while two cluster names dismatch,
the user is a little confused since this line error message is not
enough obvious.

Signed-off-by: Gang He <ghe@suse.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 91592b75c309adf729710613c3fc572831782618..323341661d082c26031c3a453fdd0f10d3a7d6d5 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -455,7 +455,8 @@ static int new_lockspace(const char *name, const char *cluster,
 
        if (dlm_config.ci_recover_callbacks && cluster &&
            strncmp(cluster, dlm_config.ci_cluster_name, DLM_LOCKSPACE_LEN)) {
-               log_print("dlm cluster name %s mismatch %s",
+               log_print("dlm cluster name '%s' does not match "
+                         "the application cluster name '%s'",
                          dlm_config.ci_cluster_name, cluster);
                error = -EBADR;
                goto out;