From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755000AbdERGdZ (ORCPT ); Thu, 18 May 2017 02:33:25 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:34734 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754704AbdERGdU (ORCPT ); Thu, 18 May 2017 02:33:20 -0400 From: Gang He To: mfasheh@versity.com, jlbec@evilplan.org Cc: Gang He , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, akpm@linux-foundation.org Subject: [PATCH] ocfs2: give an obvious tip for dismatch cluster names Date: Thu, 18 May 2017 14:35:36 +0800 Message-Id: <1495089336-19312-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 patch is used to add an obvious error message, due to dismatch cluster names between on-disk and in the current cluster. We can meet this case during OCFS2 cluster migration, if we can give the user an obvious tip for why they can not mount the file system after migration, they can quickly fix this dismatch problem. Second, also move printing ocfs2_fill_super() errno to the front of ocfs2_dismount_volume() function, since ocfs2_dismount_volume() will also print it's own message. Signed-off-by: Gang He --- fs/ocfs2/super.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index ca1646f..5575918 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1208,14 +1208,15 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) read_super_error: brelse(bh); + if (status) + mlog_errno(status); + if (osb) { atomic_set(&osb->vol_state, VOLUME_DISABLED); wake_up(&osb->osb_mount_event); ocfs2_dismount_volume(sb, 1); } - if (status) - mlog_errno(status); return status; } @@ -1843,6 +1844,9 @@ static int ocfs2_mount_volume(struct super_block *sb) status = ocfs2_dlm_init(osb); if (status < 0) { mlog_errno(status); + if (status == -EBADR) + mlog(ML_ERROR, "couldn't mount because cluster name on" + " disk does not match the running cluster name.\n"); goto leave; } -- 1.8.5.6