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

Commit c0e41338 authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2: Attach the connection to the lksb 



We're going to want it in the ast functions, so we convert union
ocfs2_dlm_lksb to struct ocfs2_dlm_lksb and let it carry the connection.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent a796d286

fs/ocfs2/dlmglue.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ static inline int ocfs2_is_inode_lock(struct ocfs2_lock_res *lockres) 
		lockres->l_type == OCFS2_LOCK_TYPE_OPEN;

		lockres->l_type == OCFS2_LOCK_TYPE_OPEN;

}

}





static inline struct ocfs2_lock_res *ocfs2_lksb_to_lock_res(union ocfs2_dlm_lksb *lksb)

static inline struct ocfs2_lock_res *ocfs2_lksb_to_lock_res(struct ocfs2_dlm_lksb *lksb)

{

{

	return container_of(lksb, struct ocfs2_lock_res, l_lksb);

	return container_of(lksb, struct ocfs2_lock_res, l_lksb);

}

}
@@ -1046,7 +1046,7 @@ static unsigned int lockres_set_pending(struct ocfs2_lock_res *lockres) 
}

}









static void ocfs2_blocking_ast(union ocfs2_dlm_lksb *lksb, int level)

static void ocfs2_blocking_ast(struct ocfs2_dlm_lksb *lksb, int level)

{

{

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);

	struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);
@@ -1077,7 +1077,7 @@ static void ocfs2_blocking_ast(union ocfs2_dlm_lksb *lksb, int level) 
	ocfs2_wake_downconvert_thread(osb);

	ocfs2_wake_downconvert_thread(osb);

}

}





static void ocfs2_locking_ast(union ocfs2_dlm_lksb *lksb)

static void ocfs2_locking_ast(struct ocfs2_dlm_lksb *lksb)

{

{

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);

	struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);
@@ -3058,7 +3058,7 @@ void ocfs2_dlm_shutdown(struct ocfs2_super *osb, 
	mlog_exit_void();

	mlog_exit_void();

}

}





static void ocfs2_unlock_ast(union ocfs2_dlm_lksb *lksb, int error)

static void ocfs2_unlock_ast(struct ocfs2_dlm_lksb *lksb, int error)

{

{

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	struct ocfs2_lock_res *lockres = ocfs2_lksb_to_lock_res(lksb);

	unsigned long flags;

	unsigned long flags;

fs/ocfs2/ocfs2.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ struct ocfs2_lock_res { 
	int                      l_level;

	int                      l_level;

	unsigned int             l_ro_holders;

	unsigned int             l_ro_holders;

	unsigned int             l_ex_holders;

	unsigned int             l_ex_holders;

	union ocfs2_dlm_lksb     l_lksb;

	struct ocfs2_dlm_lksb    l_lksb;





	/* used from AST/BAST funcs. */

	/* used from AST/BAST funcs. */

	enum ocfs2_ast_action    l_action;

	enum ocfs2_ast_action    l_action;

fs/ocfs2/stack_o2cb.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static int dlm_status_to_errno(enum dlm_status status) 




static void o2dlm_lock_ast_wrapper(void *astarg)

static void o2dlm_lock_ast_wrapper(void *astarg)

{

{

	union ocfs2_dlm_lksb *lksb = astarg;

	struct ocfs2_dlm_lksb *lksb = astarg;





	BUG_ON(o2cb_stack.sp_proto == NULL);

	BUG_ON(o2cb_stack.sp_proto == NULL);
@@ -170,7 +170,7 @@ static void o2dlm_lock_ast_wrapper(void *astarg) 




static void o2dlm_blocking_ast_wrapper(void *astarg, int level)

static void o2dlm_blocking_ast_wrapper(void *astarg, int level)

{

{

	union ocfs2_dlm_lksb *lksb = astarg;

	struct ocfs2_dlm_lksb *lksb = astarg;





	BUG_ON(o2cb_stack.sp_proto == NULL);

	BUG_ON(o2cb_stack.sp_proto == NULL);
@@ -179,7 +179,7 @@ static void o2dlm_blocking_ast_wrapper(void *astarg, int level) 




static void o2dlm_unlock_ast_wrapper(void *astarg, enum dlm_status status)

static void o2dlm_unlock_ast_wrapper(void *astarg, enum dlm_status status)

{

{

	union ocfs2_dlm_lksb *lksb = astarg;

	struct ocfs2_dlm_lksb *lksb = astarg;





	int error = dlm_status_to_errno(status);

	int error = dlm_status_to_errno(status);
@@ -204,7 +204,7 @@ static void o2dlm_unlock_ast_wrapper(void *astarg, enum dlm_status status) 




static int o2cb_dlm_lock(struct ocfs2_cluster_connection *conn,

static int o2cb_dlm_lock(struct ocfs2_cluster_connection *conn,

			 int mode,

			 int mode,

			 union ocfs2_dlm_lksb *lksb,

			 struct ocfs2_dlm_lksb *lksb,

			 u32 flags,

			 u32 flags,

			 void *name,

			 void *name,

			 unsigned int namelen)

			 unsigned int namelen)
@@ -223,7 +223,7 @@ static int o2cb_dlm_lock(struct ocfs2_cluster_connection *conn, 
}

}





static int o2cb_dlm_unlock(struct ocfs2_cluster_connection *conn,

static int o2cb_dlm_unlock(struct ocfs2_cluster_connection *conn,

			   union ocfs2_dlm_lksb *lksb,

			   struct ocfs2_dlm_lksb *lksb,

			   u32 flags)

			   u32 flags)

{

{

	enum dlm_status status;

	enum dlm_status status;
@@ -236,7 +236,7 @@ static int o2cb_dlm_unlock(struct ocfs2_cluster_connection *conn, 
	return ret;

	return ret;

}

}





static int o2cb_dlm_lock_status(union ocfs2_dlm_lksb *lksb)

static int o2cb_dlm_lock_status(struct ocfs2_dlm_lksb *lksb)

{

{

	return dlm_status_to_errno(lksb->lksb_o2dlm.status);

	return dlm_status_to_errno(lksb->lksb_o2dlm.status);

}

}
@@ -246,17 +246,17 @@ static int o2cb_dlm_lock_status(union ocfs2_dlm_lksb *lksb) 
 * contents, it will zero out the LVB.  Thus the caller can always trust

 * contents, it will zero out the LVB.  Thus the caller can always trust

 * the contents.

 * the contents.

 */

 */

static int o2cb_dlm_lvb_valid(union ocfs2_dlm_lksb *lksb)

static int o2cb_dlm_lvb_valid(struct ocfs2_dlm_lksb *lksb)

{

{

	return 1;

	return 1;

}

}





static void *o2cb_dlm_lvb(union ocfs2_dlm_lksb *lksb)

static void *o2cb_dlm_lvb(struct ocfs2_dlm_lksb *lksb)

{

{

	return (void *)(lksb->lksb_o2dlm.lvb);

	return (void *)(lksb->lksb_o2dlm.lvb);

}

}





static void o2cb_dump_lksb(union ocfs2_dlm_lksb *lksb)

static void o2cb_dump_lksb(struct ocfs2_dlm_lksb *lksb)

{

{

	dlm_print_one_lock(lksb->lksb_o2dlm.lockid);

	dlm_print_one_lock(lksb->lksb_o2dlm.lockid);

}

}

fs/ocfs2/stack_user.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -665,7 +665,7 @@ static void ocfs2_control_exit(void) 




static void fsdlm_lock_ast_wrapper(void *astarg)

static void fsdlm_lock_ast_wrapper(void *astarg)

{

{

	union ocfs2_dlm_lksb *lksb = astarg;

	struct ocfs2_dlm_lksb *lksb = astarg;

	int status = lksb->lksb_fsdlm.sb_status;

	int status = lksb->lksb_fsdlm.sb_status;





	BUG_ON(ocfs2_user_plugin.sp_proto == NULL);

	BUG_ON(ocfs2_user_plugin.sp_proto == NULL);
@@ -688,7 +688,7 @@ static void fsdlm_lock_ast_wrapper(void *astarg) 




static void fsdlm_blocking_ast_wrapper(void *astarg, int level)

static void fsdlm_blocking_ast_wrapper(void *astarg, int level)

{

{

	union ocfs2_dlm_lksb *lksb = astarg;

	struct ocfs2_dlm_lksb *lksb = astarg;





	BUG_ON(ocfs2_user_plugin.sp_proto == NULL);

	BUG_ON(ocfs2_user_plugin.sp_proto == NULL);
@@ -697,7 +697,7 @@ static void fsdlm_blocking_ast_wrapper(void *astarg, int level) 




static int user_dlm_lock(struct ocfs2_cluster_connection *conn,

static int user_dlm_lock(struct ocfs2_cluster_connection *conn,

			 int mode,

			 int mode,

			 union ocfs2_dlm_lksb *lksb,

			 struct ocfs2_dlm_lksb *lksb,

			 u32 flags,

			 u32 flags,

			 void *name,

			 void *name,

			 unsigned int namelen)

			 unsigned int namelen)
@@ -716,7 +716,7 @@ static int user_dlm_lock(struct ocfs2_cluster_connection *conn, 
}

}





static int user_dlm_unlock(struct ocfs2_cluster_connection *conn,

static int user_dlm_unlock(struct ocfs2_cluster_connection *conn,

			   union ocfs2_dlm_lksb *lksb,

			   struct ocfs2_dlm_lksb *lksb,

			   u32 flags)

			   u32 flags)

{

{

	int ret;

	int ret;
@@ -726,19 +726,19 @@ static int user_dlm_unlock(struct ocfs2_cluster_connection *conn, 
	return ret;

	return ret;

}

}





static int user_dlm_lock_status(union ocfs2_dlm_lksb *lksb)

static int user_dlm_lock_status(struct ocfs2_dlm_lksb *lksb)

{

{

	return lksb->lksb_fsdlm.sb_status;

	return lksb->lksb_fsdlm.sb_status;

}

}





static int user_dlm_lvb_valid(union ocfs2_dlm_lksb *lksb)

static int user_dlm_lvb_valid(struct ocfs2_dlm_lksb *lksb)

{

{

	int invalid = lksb->lksb_fsdlm.sb_flags & DLM_SBF_VALNOTVALID;

	int invalid = lksb->lksb_fsdlm.sb_flags & DLM_SBF_VALNOTVALID;





	return !invalid;

	return !invalid;

}

}





static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb)

static void *user_dlm_lvb(struct ocfs2_dlm_lksb *lksb)

{

{

	if (!lksb->lksb_fsdlm.sb_lvbptr)

	if (!lksb->lksb_fsdlm.sb_lvbptr)

		lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +

		lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +
@@ -746,7 +746,7 @@ static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb) 
	return (void *)(lksb->lksb_fsdlm.sb_lvbptr);

	return (void *)(lksb->lksb_fsdlm.sb_lvbptr);

}

}





static void user_dlm_dump_lksb(union ocfs2_dlm_lksb *lksb)

static void user_dlm_dump_lksb(struct ocfs2_dlm_lksb *lksb)

{

{

}

}

fs/ocfs2/stackglue.c

+11 −6
Original line number Original line Diff line number Diff line
@@ -240,47 +240,52 @@ EXPORT_SYMBOL_GPL(ocfs2_stack_glue_set_locking_protocol); 
 */

 */

int ocfs2_dlm_lock(struct ocfs2_cluster_connection *conn,

int ocfs2_dlm_lock(struct ocfs2_cluster_connection *conn,

		   int mode,

		   int mode,

		   union ocfs2_dlm_lksb *lksb,

		   struct ocfs2_dlm_lksb *lksb,

		   u32 flags,

		   u32 flags,

		   void *name,

		   void *name,

		   unsigned int namelen)

		   unsigned int namelen)

{

{

	BUG_ON(lproto == NULL);

	BUG_ON(lproto == NULL);





	if (!lksb->lksb_conn)

		lksb->lksb_conn = conn;

	else

		BUG_ON(lksb->lksb_conn != conn);

	return active_stack->sp_ops->dlm_lock(conn, mode, lksb, flags,

	return active_stack->sp_ops->dlm_lock(conn, mode, lksb, flags,

					      name, namelen);

					      name, namelen);

}

}

EXPORT_SYMBOL_GPL(ocfs2_dlm_lock);

EXPORT_SYMBOL_GPL(ocfs2_dlm_lock);





int ocfs2_dlm_unlock(struct ocfs2_cluster_connection *conn,

int ocfs2_dlm_unlock(struct ocfs2_cluster_connection *conn,

		     union ocfs2_dlm_lksb *lksb,

		     struct ocfs2_dlm_lksb *lksb,

		     u32 flags)

		     u32 flags)

{

{

	BUG_ON(lproto == NULL);

	BUG_ON(lproto == NULL);

	BUG_ON(lksb->lksb_conn == NULL);





	return active_stack->sp_ops->dlm_unlock(conn, lksb, flags);

	return active_stack->sp_ops->dlm_unlock(conn, lksb, flags);

}

}

EXPORT_SYMBOL_GPL(ocfs2_dlm_unlock);

EXPORT_SYMBOL_GPL(ocfs2_dlm_unlock);





int ocfs2_dlm_lock_status(union ocfs2_dlm_lksb *lksb)

int ocfs2_dlm_lock_status(struct ocfs2_dlm_lksb *lksb)

{

{

	return active_stack->sp_ops->lock_status(lksb);

	return active_stack->sp_ops->lock_status(lksb);

}

}

EXPORT_SYMBOL_GPL(ocfs2_dlm_lock_status);

EXPORT_SYMBOL_GPL(ocfs2_dlm_lock_status);





int ocfs2_dlm_lvb_valid(union ocfs2_dlm_lksb *lksb)

int ocfs2_dlm_lvb_valid(struct ocfs2_dlm_lksb *lksb)

{

{

	return active_stack->sp_ops->lvb_valid(lksb);

	return active_stack->sp_ops->lvb_valid(lksb);

}

}

EXPORT_SYMBOL_GPL(ocfs2_dlm_lvb_valid);

EXPORT_SYMBOL_GPL(ocfs2_dlm_lvb_valid);





void *ocfs2_dlm_lvb(union ocfs2_dlm_lksb *lksb)

void *ocfs2_dlm_lvb(struct ocfs2_dlm_lksb *lksb)

{

{

	return active_stack->sp_ops->lock_lvb(lksb);

	return active_stack->sp_ops->lock_lvb(lksb);

}

}

EXPORT_SYMBOL_GPL(ocfs2_dlm_lvb);

EXPORT_SYMBOL_GPL(ocfs2_dlm_lvb);





void ocfs2_dlm_dump_lksb(union ocfs2_dlm_lksb *lksb)

void ocfs2_dlm_dump_lksb(struct ocfs2_dlm_lksb *lksb)

{

{

	active_stack->sp_ops->dump_lksb(lksb);

	active_stack->sp_ops->dump_lksb(lksb);

}

}