diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-25 08:34:00 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-04 08:23:43 +0100 |
| commit | 93ff2971e99c90d1c4d39d242ef6050d2dc853d3 (patch) | |
| tree | 215da29d7087d4b3875285b85043056397dd050b /fs/dlm/rcom.c | |
| parent | dlm: do not byteswap rcom_lock (diff) | |
| download | linux-93ff2971e99c90d1c4d39d242ef6050d2dc853d3.tar.xz linux-93ff2971e99c90d1c4d39d242ef6050d2dc853d3.zip | |
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, static void make_config(struct dlm_ls *ls, struct rcom_config *rf) { - rf->rf_lvblen = ls->ls_lvblen; - rf->rf_lsflags = ls->ls_exflags; + rf->rf_lvblen = cpu_to_le32(ls->ls_lvblen); + rf->rf_lsflags = cpu_to_le32(ls->ls_exflags); } 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) return -EPROTO; } - if (rf->rf_lvblen != ls->ls_lvblen || - rf->rf_lsflags != ls->ls_exflags) { + if (le32_to_cpu(rf->rf_lvblen) != ls->ls_lvblen || + le32_to_cpu(rf->rf_lsflags) != ls->ls_exflags) { log_error(ls, "config mismatch: %d,%x nodeid %d: %d,%x", - ls->ls_lvblen, ls->ls_exflags, - nodeid, rf->rf_lvblen, rf->rf_lsflags); + ls->ls_lvblen, ls->ls_exflags, nodeid, + le32_to_cpu(rf->rf_lvblen), + le32_to_cpu(rf->rf_lsflags)); return -EPROTO; } return 0; @@ -401,7 +402,7 @@ int dlm_send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in) rc->rc_result = -ESRCH; rf = (struct rcom_config *) rc->rc_buf; - rf->rf_lvblen = -1; + rf->rf_lvblen = cpu_to_le32(~0U); dlm_rcom_out(rc); dlm_lowcomms_commit_buffer(mh); |