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

Commit d74c9803 authored by Kurt Hackel's avatar Kurt Hackel Committed by Mark Fasheh
Browse files

ocfs2: Added post handler callable function in o2net message handler 



Currently o2net allows one handler function per message type. This
patch adds the ability to call another function to be called after
the handler has returned the message to the other node.

Handlers are now given the option of returning a context (in the form of a
void **) which will be passed back into the post message handler function.

Signed-off-by: default avatarKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 74aa2585

fs/ocfs2/cluster/tcp.c

+11 −1
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ static void o2net_handler_put(struct o2net_msg_handler *nmh) 
 * be given to the handler if their payload is longer than the max. */

int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,

			   o2net_msg_handler_func *func, void *data,

			   o2net_post_msg_handler_func *post_func,

			   struct list_head *unreg_list)

{

	struct o2net_msg_handler *nmh = NULL;
@@ -722,6 +723,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len, 


	nmh->nh_func = func;

	nmh->nh_func_data = data;

	nmh->nh_post_func = post_func;

	nmh->nh_msg_type = msg_type;

	nmh->nh_max_len = max_len;

	nmh->nh_key = key;
@@ -1049,6 +1051,7 @@ static int o2net_process_message(struct o2net_sock_container *sc, 
	int ret = 0, handler_status;

	enum  o2net_system_error syserr;

	struct o2net_msg_handler *nmh = NULL;

	void *ret_data = NULL;



	msglog(hdr, "processing message\n");
@@ -1101,7 +1104,7 @@ static int o2net_process_message(struct o2net_sock_container *sc, 
	sc->sc_msg_type = be16_to_cpu(hdr->msg_type);

	handler_status = (nmh->nh_func)(hdr, sizeof(struct o2net_msg) +

					     be16_to_cpu(hdr->data_len),

					nmh->nh_func_data);

					nmh->nh_func_data, &ret_data);

	do_gettimeofday(&sc->sc_tv_func_stop);



out_respond:
@@ -1112,6 +1115,13 @@ static int o2net_process_message(struct o2net_sock_container *sc, 
	mlog(0, "sending handler status %d, syserr %d returned %d\n",

	     handler_status, syserr, ret);



	if (nmh) {

		BUG_ON(ret_data != NULL && nmh->nh_post_func == NULL);

		if (nmh->nh_post_func)

			(nmh->nh_post_func)(handler_status, nmh->nh_func_data,

					    ret_data);

	}



out:

	if (nmh)

		o2net_handler_put(nmh);

fs/ocfs2/cluster/tcp.h

+5 −1
Original line number Diff line number Diff line
@@ -50,7 +50,10 @@ struct o2net_msg 
	__u8  buf[0];

};



typedef int (o2net_msg_handler_func)(struct o2net_msg *msg, u32 len, void *data);

typedef int (o2net_msg_handler_func)(struct o2net_msg *msg, u32 len, void *data,

				     void **ret_data);

typedef void (o2net_post_msg_handler_func)(int status, void *data,

					   void *ret_data);



#define O2NET_MAX_PAYLOAD_BYTES  (4096 - sizeof(struct o2net_msg))
@@ -99,6 +102,7 @@ int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *vec, 


int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,

			   o2net_msg_handler_func *func, void *data,

			   o2net_post_msg_handler_func *post_func,

			   struct list_head *unreg_list);

void o2net_unregister_handler_list(struct list_head *list);

fs/ocfs2/cluster/tcp_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ struct o2net_msg_handler { 
	u32			nh_key;

	o2net_msg_handler_func	*nh_func;

	o2net_msg_handler_func	*nh_func_data;

	o2net_post_msg_handler_func

				*nh_post_func;

	struct kref		nh_kref;

	struct list_head	nh_unregister_item;

};

fs/ocfs2/dlm/dlmast.c

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ void dlm_do_local_bast(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, 






int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data)

int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,

			  void **ret_data)

{

	int ret;

	unsigned int locklen;

fs/ocfs2/dlm/dlmcommon.h

+28 −14
Original line number Diff line number Diff line
@@ -707,16 +707,20 @@ void dlm_lock_put(struct dlm_lock *lock); 
void dlm_lock_attach_lockres(struct dlm_lock *lock,

			     struct dlm_lock_resource *res);



int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data,

			    void **ret_data);

int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data,

			     void **ret_data);

int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,

			  void **ret_data);



void dlm_revert_pending_convert(struct dlm_lock_resource *res,

				struct dlm_lock *lock);

void dlm_revert_pending_lock(struct dlm_lock_resource *res,

			     struct dlm_lock *lock);



int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data,

			    void **ret_data);

void dlm_commit_pending_cancel(struct dlm_lock_resource *res,

			       struct dlm_lock *lock);

void dlm_commit_pending_unlock(struct dlm_lock_resource *res,
@@ -871,16 +875,26 @@ void dlm_lockres_release_ast(struct dlm_ctxt *dlm, 
			     struct dlm_lock_resource *res);

void __dlm_lockres_reserve_ast(struct dlm_lock_resource *res);



int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_deref_lockres_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_reco_data_done_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data);

int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,

			       void **ret_data);

int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,

			      void **ret_data);

int dlm_deref_lockres_handler(struct o2net_msg *msg, u32 len, void *data,

			      void **ret_data);

int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data,

				void **ret_data);

int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data,

			    void **ret_data);

int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data,

			       void **ret_data);

int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data,

				  void **ret_data);

int dlm_reco_data_done_handler(struct o2net_msg *msg, u32 len, void *data,

			       void **ret_data);

int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data,

			   void **ret_data);

int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data,

			      void **ret_data);

int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,

			  u8 nodenum, u8 *real_master);