From e7277ed889aaa3b831144d3e023bdcc067e35edb Mon Sep 17 00:00:00 2001 From: "Fabio M. Di Nitto" Date: Tue, 15 Jan 2008 15:13:36 -0600 Subject: [PATCH] --- yaml --- r: 80607 b: refs/heads/master c: 550283e30ccec5ddab9749a77b0022ebcaf0f3af h: refs/heads/master i: 80605: 01316316c800218405cc518709e914e21b49a586 80603: 96ef94aca77667bdda377784cdc0a3d7c4dce8fa 80599: e638bbe62f03600f2e0b3e391ba8c90ecc345cf6 80591: ca29d3ec81cd37c09cb41cae90031420db75241f 80575: 9c68d8b16a6b71762b006751b521c4e301362b29 v: v3 --- [refs] | 2 +- trunk/fs/dlm/util.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 87d92918e8ff..ed68fa4d9bef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7847d35ac39fe92c94540e88ac3d0e177f52d9e +refs/heads/master: 550283e30ccec5ddab9749a77b0022ebcaf0f3af diff --git a/trunk/fs/dlm/util.c b/trunk/fs/dlm/util.c index 963889cf6740..38dcfeb9c4b7 100644 --- a/trunk/fs/dlm/util.c +++ b/trunk/fs/dlm/util.c @@ -137,7 +137,7 @@ void dlm_rcom_out(struct dlm_rcom *rc) rc->rc_seq = cpu_to_le64(rc->rc_seq); rc->rc_seq_reply = cpu_to_le64(rc->rc_seq_reply); - if (type == DLM_RCOM_LOCK) + if ((type == DLM_RCOM_LOCK) || (type == DLM_RCOM_LOCK_REPLY)) rcom_lock_out((struct rcom_lock *) rc->rc_buf); else if (type == DLM_RCOM_STATUS_REPLY) @@ -147,6 +147,7 @@ void dlm_rcom_out(struct dlm_rcom *rc) void dlm_rcom_in(struct dlm_rcom *rc) { struct dlm_header *hd = (struct dlm_header *) rc; + int type; header_in(hd); @@ -156,10 +157,12 @@ void dlm_rcom_in(struct dlm_rcom *rc) rc->rc_seq = le64_to_cpu(rc->rc_seq); rc->rc_seq_reply = le64_to_cpu(rc->rc_seq_reply); - if (rc->rc_type == DLM_RCOM_LOCK) + type = rc->rc_type; + + if ((type == DLM_RCOM_LOCK) || (type == DLM_RCOM_LOCK_REPLY)) rcom_lock_in((struct rcom_lock *) rc->rc_buf); - else if (rc->rc_type == DLM_RCOM_STATUS_REPLY) + else if (type == DLM_RCOM_STATUS_REPLY) rcom_config_in((struct rcom_config *) rc->rc_buf); }