Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 751155a9 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2/dlm: Move struct dlm_master_list_entry to dlmcommon.h 



This patch moves some mle related definitions from dlmmaster.c
to dlmcommon.h. Future patches need these definitions to dump mle
debugging information.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.beckeroracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 4e3d24ed

fs/ocfs2/dlm/dlmcommon.h

+35 −0
Original line number Diff line number Diff line
@@ -49,6 +49,41 @@ 
/* Intended to make it easier for us to switch out hash functions */

#define dlm_lockid_hash(_n, _l) full_name_hash(_n, _l)



enum dlm_mle_type {

	DLM_MLE_BLOCK,

	DLM_MLE_MASTER,

	DLM_MLE_MIGRATION

};



struct dlm_lock_name {

	u8 len;

	u8 name[DLM_LOCKID_NAME_MAX];

};



struct dlm_master_list_entry {

	struct list_head list;

	struct list_head hb_events;

	struct dlm_ctxt *dlm;

	spinlock_t spinlock;

	wait_queue_head_t wq;

	atomic_t woken;

	struct kref mle_refs;

	int inuse;

	unsigned long maybe_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long vote_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long response_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long node_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	u8 master;

	u8 new_master;

	enum dlm_mle_type type;

	struct o2hb_callback_func mle_hb_up;

	struct o2hb_callback_func mle_hb_down;

	union {

		struct dlm_lock_resource *res;

		struct dlm_lock_name name;

	} u;

};



enum dlm_ast_type {

	DLM_AST = 0,

	DLM_BAST,

fs/ocfs2/dlm/dlmmaster.c

+0 −37
Original line number Diff line number Diff line
@@ -52,43 +52,6 @@ 
#define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)

#include "cluster/masklog.h"



enum dlm_mle_type {

	DLM_MLE_BLOCK,

	DLM_MLE_MASTER,

	DLM_MLE_MIGRATION

};



struct dlm_lock_name

{

	u8 len;

	u8 name[DLM_LOCKID_NAME_MAX];

};



struct dlm_master_list_entry

{

	struct list_head list;

	struct list_head hb_events;

	struct dlm_ctxt *dlm;

	spinlock_t spinlock;

	wait_queue_head_t wq;

	atomic_t woken;

	struct kref mle_refs;

	int inuse;

	unsigned long maybe_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long vote_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long response_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	unsigned long node_map[BITS_TO_LONGS(O2NM_MAX_NODES)];

	u8 master;

	u8 new_master;

	enum dlm_mle_type type;

	struct o2hb_callback_func mle_hb_up;

	struct o2hb_callback_func mle_hb_down;

	union {

		struct dlm_lock_resource *res;

		struct dlm_lock_name name;

	} u;

};



static void dlm_mle_node_down(struct dlm_ctxt *dlm,

			      struct dlm_master_list_entry *mle,

			      struct o2nm_node *node,