ocfs2-devel.oss.oracle.com archive mirror
 help / color / mirror / Atom feed
* [Ocfs2-devel] [PATCH] ocfs2: cleanup some definitions which is not used anymore.
@ 2021-01-19  8:18 guozh
  2021-01-20  1:50 ` Joseph Qi
  0 siblings, 1 reply; 2+ messages in thread
From: guozh @ 2021-01-19  8:18 UTC (permalink / raw)
  To: akpm, joseph.qi, ocfs2-devel

There are some definitions which is not used anymore in OCFS2 module, so as to be removed.

Signed-off-by: Guozhonghua <guozh88@chinatelecom.cn>
---
 fs/ocfs2/dlm/dlmast.c    | 10 ----------
 fs/ocfs2/dlm/dlmcommon.h |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
index 6abaded3ff6b..70a10764f249 100644
--- a/fs/ocfs2/dlm/dlmast.c
+++ b/fs/ocfs2/dlm/dlmast.c
@@ -165,16 +165,6 @@ void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
 	spin_unlock(&lock->spinlock);
 }
 
-void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
-{
-	BUG_ON(!dlm);
-	BUG_ON(!lock);
-
-	spin_lock(&dlm->ast_lock);
-	__dlm_queue_bast(dlm, lock);
-	spin_unlock(&dlm->ast_lock);
-}
-
 static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
 			   struct dlm_lock *lock)
 {
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index c8a444622faa..58d57e25d384 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -17,10 +17,7 @@
 
 #define DLM_LOCKID_NAME_MAX    32
 
-#define DLM_DOMAIN_NAME_MAX_LEN    255
 #define DLM_LOCK_RES_OWNER_UNKNOWN     O2NM_MAX_NODES
-#define DLM_THREAD_SHUFFLE_INTERVAL    5     // flush everything every 5 passes
-#define DLM_THREAD_MS                  200   // flush at least every 200 ms
 
 #define DLM_HASH_SIZE_DEFAULT	(1 << 17)
 #if DLM_HASH_SIZE_DEFAULT < PAGE_SIZE
@@ -902,7 +899,6 @@ void __dlm_lockres_grab_inflight_worker(struct dlm_ctxt *dlm,
 		struct dlm_lock_resource *res);
 
 void dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
-void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
 void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
 void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
 void dlm_do_local_ast(struct dlm_ctxt *dlm,
-- 
2.18.4
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [Ocfs2-devel] [PATCH] ocfs2: cleanup some definitions which is not used anymore.
  2021-01-19  8:18 [Ocfs2-devel] [PATCH] ocfs2: cleanup some definitions which is not used anymore guozh
@ 2021-01-20  1:50 ` Joseph Qi
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2021-01-20  1:50 UTC (permalink / raw)
  To: guozh, akpm, ocfs2-devel



On 1/19/21 4:18 PM, guozh wrote:
> There are some definitions which is not used anymore in OCFS2 module, so as to be removed.
> 
> Signed-off-by: Guozhonghua <guozh88@chinatelecom.cn>

Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
>  fs/ocfs2/dlm/dlmast.c    | 10 ----------
>  fs/ocfs2/dlm/dlmcommon.h |  4 ----
>  2 files changed, 14 deletions(-)
> 
> diff --git a/fs/ocfs2/dlm/dlmast.c b/fs/ocfs2/dlm/dlmast.c
> index 6abaded3ff6b..70a10764f249 100644
> --- a/fs/ocfs2/dlm/dlmast.c
> +++ b/fs/ocfs2/dlm/dlmast.c
> @@ -165,16 +165,6 @@ void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
>  	spin_unlock(&lock->spinlock);
>  }
>  
> -void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
> -{
> -	BUG_ON(!dlm);
> -	BUG_ON(!lock);
> -
> -	spin_lock(&dlm->ast_lock);
> -	__dlm_queue_bast(dlm, lock);
> -	spin_unlock(&dlm->ast_lock);
> -}
> -
>  static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
>  			   struct dlm_lock *lock)
>  {
> diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
> index c8a444622faa..58d57e25d384 100644
> --- a/fs/ocfs2/dlm/dlmcommon.h
> +++ b/fs/ocfs2/dlm/dlmcommon.h
> @@ -17,10 +17,7 @@
>  
>  #define DLM_LOCKID_NAME_MAX    32
>  
> -#define DLM_DOMAIN_NAME_MAX_LEN    255
>  #define DLM_LOCK_RES_OWNER_UNKNOWN     O2NM_MAX_NODES
> -#define DLM_THREAD_SHUFFLE_INTERVAL    5     // flush everything every 5 passes
> -#define DLM_THREAD_MS                  200   // flush at least every 200 ms
>  
>  #define DLM_HASH_SIZE_DEFAULT	(1 << 17)
>  #if DLM_HASH_SIZE_DEFAULT < PAGE_SIZE
> @@ -902,7 +899,6 @@ void __dlm_lockres_grab_inflight_worker(struct dlm_ctxt *dlm,
>  		struct dlm_lock_resource *res);
>  
>  void dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
> -void dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
>  void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
>  void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock);
>  void dlm_do_local_ast(struct dlm_ctxt *dlm,
> -- 
> 2.18.4
> 

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-01-20  1:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-19  8:18 [Ocfs2-devel] [PATCH] ocfs2: cleanup some definitions which is not used anymore guozh
2021-01-20  1:50 ` Joseph Qi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).