ocfs2: remove ocfs2_is_o2cb_active() (a6346447) · Commits · 戴 / test

Remove ocfs2_is_o2cb_active(). We have similar functions to identify which cluster stack is being used via osb->osb_cluster_stack. Secondly, the current implementation of ocfs2_is_o2cb_active() is not totally safe. Based on the design of stackglue, we need to get ocfs2_stack_lock before using ocfs2_stack related data structures, and that active_stack pointer can be NULL in the case of mount failure. Link: http://lkml.kernel.org/r/1495441079-11708-1-git-send-email-ghe@suse.com Signed-off-by:

Gang He <ghe@suse.com> Reviewed-by:

Joseph Qi <jiangqi903@gmail.com> Reviewed-by:

Eric Ren <zren@suse.com> Acked-by:

Changwei Ge <ge.changwei@h3c.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/ocfs2/dlmglue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3603,7 +3603,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
		* we can recover correctly from node failure. Otherwise, we may get
		* invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set.
		*/
		if (!ocfs2_is_o2cb_active() &&
		if (ocfs2_userspace_stack(osb) &&
		lockres->l_ops->flags & LOCK_TYPE_USES_LVB)
		lvb = 1;

fs/ocfs2/stackglue.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -48,12 +48,6 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl";
		*/
		static struct ocfs2_stack_plugin *active_stack;

		inline int ocfs2_is_o2cb_active(void)
		{
		return !strcmp(active_stack->sp_name, OCFS2_STACK_PLUGIN_O2CB);
		}
		EXPORT_SYMBOL_GPL(ocfs2_is_o2cb_active);

		static struct ocfs2_stack_plugin ocfs2_stack_lookup(const char name)
		{
		struct ocfs2_stack_plugin *p;

fs/ocfs2/stackglue.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -298,9 +298,6 @@ void ocfs2_stack_glue_set_max_proto_version(struct ocfs2_protocol_version *max_p
		int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin);
		void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin);

		/* In ocfs2_downconvert_lock(), we need to know which stack we are using */
		int ocfs2_is_o2cb_active(void);

		extern struct kset *ocfs2_kset;

		#endif /* STACKGLUE_H */

Admin message