The patch titled
Subject: ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2
has been removed from the -mm tree. Its filename was
ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2.patch
This patch was dropped because it was folded into ocfs2-give-an-obvious-tip-for-dismatch-cluster-names.patch
------------------------------------------------------
From: Gang He <ghe@xxxxxxxx>
Subject: ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2
Compare with initial version, we only print this error tip when the user
uses pcmk stack. since in o2cb stack, the user will not meet this error.
Link: http://lkml.kernel.org/r/1495419305-3780-1-git-send-email-ghe@xxxxxxxx
Signed-off-by: Gang He <ghe@xxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <jiangqi903@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2 fs/ocfs2/super.c
--- a/fs/ocfs2/super.c~ocfs2-give-an-obvious-tip-for-dismatch-cluster-names-v2
+++ a/fs/ocfs2/super.c
@@ -1844,7 +1844,7 @@ static int ocfs2_mount_volume(struct sup
status = ocfs2_dlm_init(osb);
if (status < 0) {
mlog_errno(status);
- if (status == -EBADR)
+ 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;
_
Patches currently in -mm which might be from ghe@xxxxxxxx are
ocfs2-get-rid-of-ocfs2_is_o2cb_active-function.patch
ocfs2-give-an-obvious-tip-for-dismatch-cluster-names.patch
ocfs2-move-some-definitions-to-header-file.patch
ocfs2-fix-some-small-problems.patch
ocfs2-add-kobject-for-online-file-check.patch
ocfs2-add-duplicative-ino-number-check.patch
ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock.patch
ocfs2-add-ocfs2_try_rw_lock-and-ocfs2_try_inode_lock-v2.patch
ocfs2-add-ocfs2_overwrite_io-function.patch
ocfs2-add-ocfs2_overwrite_io-function-v2.patch
ocfs2-nowait-aio-support.patch
ocfs2-nowait-aio-support-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
