diff options
author | David Teigland <teigland@redhat.com> | 2017-10-09 10:29:31 -0400 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2017-10-09 10:29:31 -0400 |
commit | 9250e523592a8ced3ecd14abe29fbb1e036bd7eb (patch) | |
tree | 79b4675d8c600a755fac468415fea6e62d76f1ca | |
parent | 9e1b0211c5dd4acbd21a8ec1b86fc38a497a4656 (diff) |
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: David Teigland <teigland@redhat.com>
-rw-r--r-- | fs/dlm/lock.c | 1 | ||||
-rw-r--r-- | fs/dlm/rcom.c | 20 | ||||
-rw-r--r-- | fs/dlm/rcom.h | 1 |
3 files changed, 1 insertions, 21 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index f145a2a9d6cb..cc91963683de 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
@@ -1003,7 +1003,6 @@ int dlm_master_lookup(struct dlm_ls *ls, int from_nodeid, char *name, int len, | |||
1003 | if (r->res_master_nodeid == our_nodeid) { | 1003 | if (r->res_master_nodeid == our_nodeid) { |
1004 | log_error(ls, "from_master %d our_master", from_nodeid); | 1004 | log_error(ls, "from_master %d our_master", from_nodeid); |
1005 | dlm_dump_rsb(r); | 1005 | dlm_dump_rsb(r); |
1006 | dlm_send_rcom_lookup_dump(r, from_nodeid); | ||
1007 | goto out_found; | 1006 | goto out_found; |
1008 | } | 1007 | } |
1009 | 1008 | ||
diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c index 4ff061de927e..70c625999d36 100644 --- a/fs/dlm/rcom.c +++ b/fs/dlm/rcom.c | |||
@@ -338,25 +338,6 @@ int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid) | |||
338 | return error; | 338 | return error; |
339 | } | 339 | } |
340 | 340 | ||
341 | int dlm_send_rcom_lookup_dump(struct dlm_rsb *r, int to_nodeid) | ||
342 | { | ||
343 | struct dlm_rcom *rc; | ||
344 | struct dlm_mhandle *mh; | ||
345 | struct dlm_ls *ls = r->res_ls; | ||
346 | int error; | ||
347 | |||
348 | error = create_rcom(ls, to_nodeid, DLM_RCOM_LOOKUP, r->res_length, | ||
349 | &rc, &mh); | ||
350 | if (error) | ||
351 | goto out; | ||
352 | memcpy(rc->rc_buf, r->res_name, r->res_length); | ||
353 | rc->rc_id = 0xFFFFFFFF; | ||
354 | |||
355 | send_rcom(ls, mh, rc); | ||
356 | out: | ||
357 | return error; | ||
358 | } | ||
359 | |||
360 | static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in) | 341 | static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in) |
361 | { | 342 | { |
362 | struct dlm_rcom *rc; | 343 | struct dlm_rcom *rc; |
@@ -368,6 +349,7 @@ static void receive_rcom_lookup(struct dlm_ls *ls, struct dlm_rcom *rc_in) | |||
368 | if (error) | 349 | if (error) |
369 | return; | 350 | return; |
370 | 351 | ||
352 | /* Old code would send this special id to trigger a debug dump. */ | ||
371 | if (rc_in->rc_id == 0xFFFFFFFF) { | 353 | if (rc_in->rc_id == 0xFFFFFFFF) { |
372 | log_error(ls, "receive_rcom_lookup dump from %d", nodeid); | 354 | log_error(ls, "receive_rcom_lookup dump from %d", nodeid); |
373 | dlm_dump_rsb_name(ls, rc_in->rc_buf, len); | 355 | dlm_dump_rsb_name(ls, rc_in->rc_buf, len); |
diff --git a/fs/dlm/rcom.h b/fs/dlm/rcom.h index f8e243463c15..206723ab744d 100644 --- a/fs/dlm/rcom.h +++ b/fs/dlm/rcom.h | |||
@@ -17,7 +17,6 @@ | |||
17 | int dlm_rcom_status(struct dlm_ls *ls, int nodeid, uint32_t status_flags); | 17 | int dlm_rcom_status(struct dlm_ls *ls, int nodeid, uint32_t status_flags); |
18 | int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name,int last_len); | 18 | int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name,int last_len); |
19 | int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid); | 19 | int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid); |
20 | int dlm_send_rcom_lookup_dump(struct dlm_rsb *r, int to_nodeid); | ||
21 | int dlm_send_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb); | 20 | int dlm_send_rcom_lock(struct dlm_rsb *r, struct dlm_lkb *lkb); |
22 | void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid); | 21 | void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid); |
23 | int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in); | 22 | int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in); |