From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836AbdERCkI (ORCPT ); Wed, 17 May 2017 22:40:08 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:47788 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753689AbdERCkH (ORCPT ); Wed, 17 May 2017 22:40:07 -0400 From: Gang He To: ccaulfie@redhat.com, teigland@redhat.com Cc: Gang He , hch@lst.de, cluster-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v2] dlm: Make dismatch error message more clear Date: Thu, 18 May 2017 10:42:12 +0800 Message-Id: <1495075332-13628-1-git-send-email-ghe@suse.com> X-Mailer: git-send-email 1.8.5.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- fs/dlm/lockspace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 91592b7..b03d808 100644 --- 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; -- 1.8.5.6