|
@@ -1208,14 +1208,15 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
|
|
read_super_error:
|
|
read_super_error:
|
|
brelse(bh);
|
|
brelse(bh);
|
|
|
|
|
|
|
|
+ if (status)
|
|
|
|
+ mlog_errno(status);
|
|
|
|
+
|
|
if (osb) {
|
|
if (osb) {
|
|
atomic_set(&osb->vol_state, VOLUME_DISABLED);
|
|
atomic_set(&osb->vol_state, VOLUME_DISABLED);
|
|
wake_up(&osb->osb_mount_event);
|
|
wake_up(&osb->osb_mount_event);
|
|
ocfs2_dismount_volume(sb, 1);
|
|
ocfs2_dismount_volume(sb, 1);
|
|
}
|
|
}
|
|
|
|
|
|
- if (status)
|
|
|
|
- mlog_errno(status);
|
|
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1843,6 +1844,9 @@ static int ocfs2_mount_volume(struct super_block *sb)
|
|
status = ocfs2_dlm_init(osb);
|
|
status = ocfs2_dlm_init(osb);
|
|
if (status < 0) {
|
|
if (status < 0) {
|
|
mlog_errno(status);
|
|
mlog_errno(status);
|
|
|
|
+ if (status == -EBADR && ocfs2_userspace_stack(osb))
|
|
|
|
+ mlog(ML_ERROR, "couldn't mount because cluster name on"
|
|
|
|
+ " disk does not match the running cluster name.\n");
|
|
goto leave;
|
|
goto leave;
|
|
}
|
|
}
|
|
|
|
|