ocfs2: remove unused macros (8e6ef373) · Commits · 戴 / test

O2HB_DEFAULT_BLOCK_BITS/DLM_THREAD_MAX_ASTS/DLM_MIGRATION_RETRY_MS and OCFS2_MAX_RESV_WINDOW_BITS/OCFS2_MIN_RESV_WINDOW_BITS have been unused since commit ("ocfs2/dlm: Do not migrate resource to a node that is leaving the domain"). Signed-off-by:

Alex Shi <alex.shi@linux.alibaba.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: ChenGang <cg.chen@huawei.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Richard Fontana <rfontana@redhat.com> Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Junxiao Bi <junxiao.bi@oracle.com> Cc: Joseph Qi <jiangqi903@gmail.com> Cc: Changwei Ge <gechangwei@live.cn> Cc: Gang He <ghe@suse.com> Cc: Jun Piao <piaojun@huawei.com> Link: http://lkml.kernel.org/r/1579577827-251796-1-git-send-email-alex.shi@linux.alibaba.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/ocfs2/cluster/heartbeat.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -101,8 +101,6 @@ static struct o2hb_callback {

		static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type);

		#define O2HB_DEFAULT_BLOCK_BITS 9

		enum o2hb_heartbeat_modes {
		O2HB_HEARTBEAT_LOCAL = 0,
		O2HB_HEARTBEAT_GLOBAL,

fs/ocfs2/dlm/dlmmaster.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2749,8 +2749,6 @@ leave:
		return ret;
		}

		#define DLM_MIGRATION_RETRY_MS 100

		/*
		* Should be called only after beginning the domain leave process.
		* There should not be any remaining locks on nonlocal lock resources,

fs/ocfs2/dlm/dlmthread.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -680,7 +680,6 @@ static void dlm_flush_asts(struct dlm_ctxt *dlm)

		#define DLM_THREAD_TIMEOUT_MS (4 * 1000)
		#define DLM_THREAD_MAX_DIRTY 100
		#define DLM_THREAD_MAX_ASTS 10

		static int dlm_thread(void *data)
		{

fs/ocfs2/reservations.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -33,9 +33,6 @@

		static DEFINE_SPINLOCK(resv_lock);

		#define OCFS2_MIN_RESV_WINDOW_BITS 8
		#define OCFS2_MAX_RESV_WINDOW_BITS 1024

		int ocfs2_dir_resv_allowed(struct ocfs2_super *osb)
		{
		return (osb->osb_resv_level && osb->osb_dir_resv_level);

Admin message