diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-25 02:34:00 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2008-02-04 02:23:43 -0500 |
commit | 93ff2971e99c90d1c4d39d242ef6050d2dc853d3 (patch) | |
tree | 215da29d7087d4b3875285b85043056397dd050b /fs/dlm/rcom.c | |
parent | 163a1859ec6c4c33547bf4613efabf52031566aa (diff) |
dlm: do not byteswap rcom_config
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/rcom.c')
-rw-r--r-- | fs/dlm/rcom.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c index 86c1ab99208e..fb0776201d73 100644 --- a/fs/dlm/rcom.c +++ b/fs/dlm/rcom.c | |||
@@ -78,8 +78,8 @@ static void send_rcom(struct dlm_ls *ls, struct dlm_mhandle *mh, | |||
78 | 78 | ||
79 | static void make_config(struct dlm_ls *ls, struct rcom_config *rf) | 79 | static void make_config(struct dlm_ls *ls, struct rcom_config *rf) |
80 | { | 80 | { |
81 | rf->rf_lvblen = ls->ls_lvblen; | 81 | rf->rf_lvblen = cpu_to_le32(ls->ls_lvblen); |
82 | rf->rf_lsflags = ls->ls_exflags; | 82 | rf->rf_lsflags = cpu_to_le32(ls->ls_exflags); |
83 | } | 83 | } |
84 | 84 | ||
85 | static int check_config(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid) | 85 | static int check_config(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid) |
@@ -93,11 +93,12 @@ static int check_config(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid) | |||
93 | return -EPROTO; | 93 | return -EPROTO; |
94 | } | 94 | } |
95 | 95 | ||
96 | if (rf->rf_lvblen != ls->ls_lvblen || | 96 | if (le32_to_cpu(rf->rf_lvblen) != ls->ls_lvblen || |
97 | rf->rf_lsflags != ls->ls_exflags) { | 97 | le32_to_cpu(rf->rf_lsflags) != ls->ls_exflags) { |
98 | log_error(ls, "config mismatch: %d,%x nodeid %d: %d,%x", | 98 | log_error(ls, "config mismatch: %d,%x nodeid %d: %d,%x", |
99 | ls->ls_lvblen, ls->ls_exflags, | 99 | ls->ls_lvblen, ls->ls_exflags, nodeid, |
100 | nodeid, rf->rf_lvblen, rf->rf_lsflags); | 100 | le32_to_cpu(rf->rf_lvblen), |
101 | le32_to_cpu(rf->rf_lsflags)); | ||
101 | return -EPROTO; | 102 | return -EPROTO; |
102 | } | 103 | } |
103 | return 0; | 104 | return 0; |
@@ -401,7 +402,7 @@ int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in) | |||
401 | rc->rc_result = -ESRCH; | 402 | rc->rc_result = -ESRCH; |
402 | 403 | ||
403 | rf = (struct rcom_config *) rc->rc_buf; | 404 | rf = (struct rcom_config *) rc->rc_buf; |
404 | rf->rf_lvblen = -1; | 405 | rf->rf_lvblen = cpu_to_le32(~0U); |
405 | 406 | ||
406 | dlm_rcom_out(rc); | 407 | dlm_rcom_out(rc); |
407 | dlm_lowcomms_commit_buffer(mh); | 408 | dlm_lowcomms_commit_buffer(mh); |