ocfs2-cleanup-some-definitions-which-is-not-used-anymore.patch removed from -mm tree
The patch titled
Subject: ocfs2: clean up some definitions which are not used any more
has been removed from the -mm tree. Its filename was
ocfs2-cleanup-some-definitions-which-is-not-used-anymore.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: guozh <[email protected]>
Subject: 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.
Signed-off-by Guozhonghua <[email protected]>
Acked-by Joseph Qi <[email protected]>
Cc Mark Fasheh <[email protected]>
Cc Joel Becker <[email protected]>
Cc Junxiao Bi <[email protected]>
Cc Changwei Ge <[email protected]>
Cc Gang He <[email protected]>
Cc Jun Piao <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/ocfs2/dlm/dlmast.c | 10 ---------- fs/ocfs2/dlm/dlmcommon.h | 4 ---- 2 files changed, 14 deletions(-)
fs/ocfs2/dlm/dlmast.c renamed from fs/ocfs2/dlm/dlmast.c~ocfs2-cleanup-some-definitions-which-is-not-used-anymore +0 -10
@@ -165,16 +165,6 @@ void __dlm_queue_bast(struct dlm_ctxt *dspin_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 renamed from fs/ocfs2/dlm/dlmcommon.h~ocfs2-cleanup-some-definitions-which-is-not-used-anymore +0 -4
@@ -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_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,
_
Patches currently in -mm which might be from [email protected] are