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

Commit 9250e523 authored by David Teigland's avatar David Teigland
Browse files

dlm: remove dlm_send_rcom_lookup_dump 



This function was only for debugging.  It would be
called in a condition that should not happen, and
should probably have been removed from the final
version of the original commit.

Remove it because it does mutex lock under spin lock.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 9e1b0211

fs/dlm/lock.c

+0 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,6 @@ int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, char *name, int len, 
		if (r->res_master_nodeid == our_nodeid) {

			log_error(ls, "from_master %d our_master", from_nodeid);

			dlm_dump_rsb(r);

			dlm_send_rcom_lookup_dump(r, from_nodeid);

			goto out_found;

		}

fs/dlm/rcom.c

+1 −19
Original line number Diff line number Diff line
@@ -338,25 +338,6 @@ int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid) 
	return error;

}



int dlm_send_rcom_lookup_dump(struct dlm_rsb *r, int to_nodeid)

{

	struct dlm_rcom *rc;

	struct dlm_mhandle *mh;

	struct dlm_ls *ls = r->res_ls;

	int error;



	error = create_rcom(ls, to_nodeid, DLM_RCOM_LOOKUP, r->res_length,

			    &rc, &mh);

	if (error)

		goto out;

	memcpy(rc->rc_buf, r->res_name, r->res_length);

	rc->rc_id = 0xFFFFFFFF;



	send_rcom(ls, mh, rc);

 out:

	return error;

}



static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in)

{

	struct dlm_rcom *rc;
@@ -368,6 +349,7 @@ static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in) 
	if (error)

		return;



	/* Old code would send this special id to trigger a debug dump. */

	if (rc_in->rc_id == 0xFFFFFFFF) {

		log_error(ls, "receive_rcom_lookup dump from %d", nodeid);

		dlm_dump_rsb_name(ls, rc_in->rc_buf, len);

fs/dlm/rcom.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
int dlm_rcom_status(struct dlm_ls *ls, int nodeid, uint32_t status_flags);

int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name,int last_len);

int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid);

int dlm_send_rcom_lookup_dump(struct dlm_rsb *r, int to_nodeid);

int dlm_send_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb);

void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid);

int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in);