Re: [PATCH] OCFS2: remove unused macros

[Joseph Qi]

On 20/1/21 11:37, Alex Shi wrote:
> O2HB_DEFAULT_BLOCK_BITS/DLM_THREAD_MAX_ASTS/DLM_MIGRATION_RETRY_MS and
> OCFS2_MAX_RESV_WINDOW_BITS/OCFS2_MIN_RESV_WINDOW_BITS are
> never used from they were introduced to kernel. so better to remove
> them.
> 
> Signed-off-by: Alex Shi <alex.shi@xxxxxxxxxxxxxxxxx>
> Cc: Mark Fasheh <mark@xxxxxxxxxx> 
> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> 
> Cc: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx> 
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> 
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> 
> Cc: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx> 
> Cc: ChenGang <cg.chen@xxxxxxxxxx> 
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> 
> Cc: Richard Fontana <rfontana@xxxxxxxxxx> 
> Cc: ocfs2-devel@xxxxxxxxxxxxxx 
> Cc: linux-kernel@xxxxxxxxxxxxxxx 
> ---
>  fs/ocfs2/cluster/heartbeat.c | 2 --
>  fs/ocfs2/dlm/dlmmaster.c     | 2 --
>  fs/ocfs2/dlm/dlmthread.c     | 1 -
>  fs/ocfs2/reservations.c      | 3 ---
>  4 files changed, 8 deletions(-)
> 
> diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> index a368350d4c27..78cb48d6a596 100644
> --- a/fs/ocfs2/cluster/heartbeat.c
> +++ b/fs/ocfs2/cluster/heartbeat.c
> @@ -101,8 +101,6 @@ struct o2hb_debug_buf {
>  
>  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,
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index 74b768ca1cd8..123b6873d9fa 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -2751,8 +2751,6 @@ static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
>  	return ret;
>  }
>  
> -#define DLM_MIGRATION_RETRY_MS  100
> -
It is no longer used since commit 66effd3c6812 ("ocfs2/dlm: Do not
migrate resource to a node that is leaving the domain").

>  /*
>   * Should be called only after beginning the domain leave process.
>   * There should not be any remaining locks on nonlocal lock resources,
> diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
> index 61c51c268460..2dd9727537fe 100644
> --- a/fs/ocfs2/dlm/dlmthread.c
> +++ b/fs/ocfs2/dlm/dlmthread.c
> @@ -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)
>  {
> diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c
> index 0249e8ca1028..bf3842e34fb9 100644
> --- a/fs/ocfs2/reservations.c
> +++ b/fs/ocfs2/reservations.c
> @@ -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);
>