Skip to contentSkip to conversation

ocfs2: cleanup some definitions which is not used anymore.

PATCH Applied guozh 2 participants 2 messages Jan 19, 2021 – Jan 20, 2021 OCFS2

lore
Share & tools
lore

guozh

author
#0 lore raw

PATCH 1/1 ocfs2: cleanup some definitions which is not used anymore.

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

---
 fs/ocfs2/dlm/dlmast.c    | 10 ----------
 fs/ocfs2/dlm/dlmcommon.h |  4 ----

 2 files changed, 14 deletions(-)
fs/ocfs2/dlm/dlmast.c +0 -0
index 6abaded3ff6b..70a10764f249 100644
@@ -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)
 {

fs/ocfs2/dlm/dlmcommon.h +0 -0
index c8a444622faa..58d57e25d384 100644
@@ -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
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · guozh

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

Quoted 43 lines

---
 fs/ocfs2/dlm/dlmast.c    | 10 ----------
 fs/ocfs2/dlm/dlmcommon.h |  4 ----

 2 files changed, 14 deletions(-)
fs/ocfs2/dlm/dlmast.c +0 -0
index 6abaded3ff6b..70a10764f249 100644
@@ -165,16 +165,6 @@ void __dlm_queue_bast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
  	spin_unlock(&lock->spinlock);
  }

fs/ocfs2/dlm/dlmast.c +0 -10
-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)
 {

fs/ocfs2/dlm/dlmcommon.h +0 -0
index c8a444622faa..58d57e25d384 100644
@@ -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

fs/ocfs2/dlm/dlmcommon.h +0 -2
-#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

fs/ocfs2/dlm/dlmcommon.h +0 -0
@@ -902,7 +899,6 @@ void __dlm_lockres_grab_inflight_worker(struct dlm_ctxt *dlm,
  		struct dlm_lock_resource *res);
Quoted 9 lines


 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
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel