Commit 95e126d6 authored by guozh's avatar guozh Committed by Linus Torvalds
Browse files

ocfs2: clean up some definitions which are not used any more 

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

Link: https://lkml.kernel.org/r/2021011916182284700534@chinatelecom.cn


Signed-off-by: default avatarGuozhonghua <guozh88@chinatelecom.cn>
Acked-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6efb5949

fs/ocfs2/dlm/dlmast.c

+0 −10
Original line number Diff line number Diff line
@@ -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 −4
Original line number Diff line number Diff line
@@ -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,