Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1643862

[PATCH] ocfs2: give an obvious tip for dismatch cluster names

Show all headers | View raw

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 <ghe@suse.com>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ocfs2: give an obvious tip for dismatch cluster names Gang He <ghe@suse.com> - 2017-05-18 08:40 +0200
  Re: [Ocfs2-devel] [PATCH] ocfs2: give an obvious tip for dismatch  cluster names Joseph Qi <jiangqi903@gmail.com> - 2017-05-18 11:50 +0200
    Re: [Ocfs2-devel] [PATCH] ocfs2: give an obvious tip for  dismatch cluster names "Gang He" <ghe@suse.com> - 2017-05-18 12:50 +0200
      Re: [Ocfs2-devel] [PATCH] ocfs2: give an obvious tip for dismatch  cluster names Joseph Qi <jiangqi903@gmail.com> - 2017-05-19 02:50 +0200
        Re: [Ocfs2-devel] [PATCH] ocfs2: give an obvious tip for  dismatch cluster names "Gang He" <ghe@suse.com> - 2017-05-19 04:20 +0200

csiph-web