diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index ccac542a0151e607507f2c54096e70a81abe8f7c..46bc23b301fe336330d78703acc4e5cade3478a0 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,13 @@ tbd Cluster File Systems, Inc. <info@clusterfs.com>
* Recommended e2fsprogs version: 1.40.2-cfs1
* Note that reiserfs quotas are disabled on SLES 10 in this kernel.
+Severity : normal
+Bugzilla : 13497
+Description: LASSERT_{REQ,REP}SWAB macros are buggy
+Details : If SWAB_PARANOIA is disabled, the LASSERT_REQSWAB and
+ LASSERT_REPSWAB macros become no-ops, which is incorrect. Drop
+ these macros and replace them with their difinitions instead.
+
Severity : normal
Bugzilla : 13556
Description: conf-sanity.sh test_33 failed with 1
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 04d6a2186f42cfec58c9607bb08035a0b1b72b86..e2ec068a2169f9fdb0b2b067d63b8cc4436330dc 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -386,24 +386,6 @@ static inline int lustre_rep_swabbed(struct ptlrpc_request *req, int index)
return req->rq_rep_swab_mask & (1 << index);
}
-#define SWAB_PARANOIA 1
-
-#if SWAB_PARANOIA
-/* unpacking: assert idx not unpacked already */
-#define LASSERT_REQSWAB(rq, idx) lustre_set_req_swabbed(rq, idx)
-#define LASSERT_REPSWAB(rq, idx) lustre_set_rep_swabbed(rq, idx)
-
-/* just looking: assert idx already unpacked */
-#define LASSERT_REQSWABBED(rq, idx) LASSERT(lustre_req_swabbed(rq, idx))
-#define LASSERT_REPSWABBED(rq, idx) LASSERT(lustre_rep_swabbed(rq, idx))
-
-#else
-#define LASSERT_REQSWAB(rq, idx)
-#define LASSERT_REPSWAB(rq, idx)
-#define LASSERT_REQSWABBED(rq, idx)
-#define LASSERT_REPSWABBED(rq, idx)
-#endif
-
static inline const char *
ptlrpc_rqphase2str(struct ptlrpc_request *req)
{
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 2a14fb76a7d8901440ae7ebcf9386f8d0fb12e44..4bd360d584e718bd4b1cf5a87e68d4e640c1fff7 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -569,7 +569,7 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
OBD_RACE(OBD_FAIL_TGT_CONN_RACE);
- LASSERT_REQSWAB(req, REQ_REC_OFF);
+ lustre_set_req_swabbed(req, REQ_REC_OFF);
str = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF, sizeof(tgtuuid)-1);
if (str == NULL) {
DEBUG_REQ(D_ERROR, req, "bad target UUID for connect");
@@ -610,7 +610,7 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
Really, class_uuid2obd should take the ref. */
targref = class_incref(target);
- LASSERT_REQSWAB(req, REQ_REC_OFF + 1);
+ lustre_set_req_swabbed(req, REQ_REC_OFF + 1);
str = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF + 1,
sizeof(cluuid) - 1);
if (str == NULL) {
diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index e241dfcf688e0395fa25c67f4af24f3813388ff0..f5715566429c796114569e7f1f2e5f8ffbd39fe5 100644
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -112,7 +112,7 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
sizeof(*body));
LASSERT(body != NULL); /* checked by mdc_readpage() */
/* swabbed by mdc_readpage() */
- LASSERT_REPSWABBED(request, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(request, REPLY_REC_OFF));
st->st_size = body->size;
} else {
diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index dc20c614ad3fe09b968bbe5fbe9286b61412501e..680c0e27596ddcc15431addddb5b403b77f1e9e0 100644
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -144,7 +144,8 @@ int llu_local_open(struct llu_inode_info *lli, struct lookup_intent *it)
body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, sizeof(*body));
LASSERT(body != NULL); /* reply already checked out */
- LASSERT_REPSWABBED(req, DLM_REPLY_REC_OFF); /* and swabbed down */
+ /* and swabbed down */
+ LASSERT(lustre_rep_swabbed(req, DLM_REPLY_REC_OFF));
/* already opened? */
if (lli->lli_open_count++)
diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index 2cee7dac9aaacd3125b0b2e4c0b42aa1494b553e..5425d6bff18bfc7c9550ee45884c06205ec9a2a4 100644
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -907,7 +907,7 @@ static int llu_readlink_internal(struct inode *inode,
body = lustre_msg_buf((*request)->rq_repmsg, REPLY_REC_OFF,
sizeof(*body));
LASSERT(body != NULL);
- LASSERT_REPSWABBED(*request, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(*request, REPLY_REC_OFF));
if ((body->valid & OBD_MD_LINKNAME) == 0) {
CERROR ("OBD_MD_LINKNAME not set on reply\n");
diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 49caf89fe1a0bf07e88196062a5081876b183cd9..b78bbb5988538f6e9ce884c1aeb9f4475df8f049 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -103,7 +103,7 @@ static int ll_dir_readpage(struct file *file, struct page *page)
sizeof(*body));
LASSERT(body != NULL); /* checked by mdc_readpage() */
/* swabbed by mdc_readpage() */
- LASSERT_REPSWABBED(request, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(request, REPLY_REC_OFF));
i_size_write(inode, body->size);
SetPageUptodate(page);
@@ -589,7 +589,7 @@ int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmmp,
sizeof(*body));
LASSERT(body != NULL); /* checked by mdc_getattr_name */
/* swabbed by mdc_getattr_name */
- LASSERT_REPSWABBED(req, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(req, REPLY_REC_OFF));
lmmsize = body->eadatasize;
@@ -600,7 +600,7 @@ int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmmp,
lmm = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1, lmmsize);
LASSERT(lmm != NULL);
- LASSERT_REPSWABBED(req, REPLY_REC_OFF + 1);
+ LASSERT(lustre_rep_swabbed(req, REPLY_REC_OFF + 1));
/*
* This is coming from the MDS, so is probably in
@@ -730,7 +730,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
sizeof(*body));
LASSERT(body != NULL); /* checked by mdc_getattr_name */
/* swabbed by mdc_getattr_name */
- LASSERT_REPSWABBED(request, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(request, REPLY_REC_OFF));
} else {
GOTO(out_req, rc);
}
diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index aa6d6cbd3968247ca2f4da3ff0ad170bf5379598..a0ea289393e6be419afd9edbece9f845975c56f7 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -331,7 +331,8 @@ static void ll_och_fill(struct ll_inode_info *lli, struct lookup_intent *it,
body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, sizeof(*body));
LASSERT(body != NULL); /* reply already checked out */
- LASSERT_REPSWABBED(req, DLM_REPLY_REC_OFF); /* and swabbed in mdc_enqueue */
+ /* and swabbed in mdc_enqueue */
+ LASSERT(lustre_rep_swabbed(req, DLM_REPLY_REC_OFF));
memcpy(&och->och_fh, &body->handle, sizeof(body->handle));
och->och_magic = OBD_CLIENT_HANDLE_MAGIC;
@@ -1745,7 +1746,7 @@ int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
sizeof(*body));
LASSERT(body != NULL); /* checked by mdc_getattr_name */
/* swabbed by mdc_getattr_name */
- LASSERT_REPSWABBED(req, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(req, REPLY_REC_OFF));
lmmsize = body->eadatasize;
@@ -1757,7 +1758,7 @@ int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
lmm = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1,
lmmsize);
LASSERT(lmm != NULL);
- LASSERT_REPSWABBED(req, REPLY_REC_OFF + 1);
+ LASSERT(lustre_rep_swabbed(req, REPLY_REC_OFF + 1));
/*
* This is coming from the MDS, so is probably in
diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 625e84fbf541ee79b0748e9b7d055b484d21b834..21de06bd076e06a6fbb46615b620308243d7e08a 100644
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -59,7 +59,7 @@ static int ll_readlink_internal(struct inode *inode,
body = lustre_msg_buf((*request)->rq_repmsg, REPLY_REC_OFF,
sizeof(*body));
LASSERT(body != NULL);
- LASSERT_REPSWABBED(*request, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(*request, REPLY_REC_OFF));
if ((body->valid & OBD_MD_LINKNAME) == 0) {
CERROR("OBD_MD_LINKNAME not set on reply\n");
diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
index 235a9eda58da90f41ac37feee97fec4ef489dba1..2565fed619bb0887cc34a71fe3341a842774b68d 100644
--- a/lustre/llite/xattr.c
+++ b/lustre/llite/xattr.c
@@ -269,7 +269,7 @@ do_getxattr:
body = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF, sizeof(*body));
LASSERT(body);
- LASSERT_REPSWABBED(req, REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(req, REPLY_REC_OFF));
/* only detect the xattr size */
if (size == 0)
@@ -288,7 +288,7 @@ do_getxattr:
}
/* do not need swab xattr data */
- LASSERT_REPSWAB(req, REPLY_REC_OFF + 1);
+ lustre_set_rep_swabbed(req, REPLY_REC_OFF + 1);
xdata = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1,
body->eadatasize);
if (!xdata) {
diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 6e08a732b01442dd0a362d91d2efcb189ec8e071..6f2da48b0506f8cff064c6f2d861f776b5b299fd 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -442,7 +442,8 @@ static int mdc_finish_enqueue(struct obd_export *exp,
lockrep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF,
sizeof(*lockrep));
LASSERT(lockrep != NULL); /* checked by ldlm_cli_enqueue() */
- LASSERT_REPSWABBED(req, DLM_LOCKREPLY_OFF); /* swabbed by ldlm_cli_enqueue() */
+ /* swabbed by ldlm_cli_enqueue() */
+ LASSERT(lustre_rep_swabbed(req, DLM_LOCKREPLY_OFF));
it->d.lustre.it_disposition = (int)lockrep->lock_policy_res1;
it->d.lustre.it_status = (int)lockrep->lock_policy_res2;
@@ -665,8 +666,10 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
mds_body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF,
sizeof(*mds_body));
- LASSERT(mds_body != NULL); /* mdc_enqueue checked */
- LASSERT_REPSWABBED(req, DLM_REPLY_REC_OFF); /* mdc_enqueue swabbed */
+ /* mdc_enqueue checked */
+ LASSERT(mds_body != NULL);
+ /* mdc_enqueue swabbed */
+ LASSERT(lustre_rep_swabbed(req, DLM_REPLY_REC_OFF));
/* If we were revalidating a fid/name pair, mark the intent in
* case we fail and get called again from lookup */
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 800051affd304ef3288f49db05dbe6287d4b4169..fc3358eae856dec25251ed49a850c1012cb90b07 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -144,7 +144,7 @@ int mdc_getattr_common(struct obd_export *exp, unsigned int ea_size,
CDEBUG(D_NET, "mode: %o\n", body->mode);
- LASSERT_REPSWAB(req, REPLY_REC_OFF + 1);
+ lustre_set_rep_swabbed(req, REPLY_REC_OFF + 1);
if (body->eadatasize != 0) {
/* reply indicates presence of eadata; check it's there... */
eadata = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF + 1,
@@ -419,7 +419,7 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
md->body = lustre_msg_buf(req->rq_repmsg, offset, sizeof (*md->body));
LASSERT (md->body != NULL);
- LASSERT_REPSWABBED(req, offset);
+ LASSERT(lustre_rep_swabbed(req, offset));
offset++;
if (md->body->valid & OBD_MD_FLEASIZE) {
@@ -442,7 +442,7 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
CERROR ("incorrect message: lmm == 0\n");
GOTO(err_out, rc = -EPROTO);
}
- LASSERT_REPSWABBED(req, offset);
+ LASSERT(lustre_rep_swabbed(req, offset));
rc = obd_unpackmd(exp, &md->lsm, lmm, lmmsize);
if (rc < 0)
@@ -575,7 +575,7 @@ void mdc_set_open_replay_data(struct obd_client_handle *och,
/* incoming message in my byte order (it's been swabbed) */
LASSERT(rec != NULL);
- LASSERT_REPSWABBED(open_req, DLM_REPLY_REC_OFF);
+ LASSERT(lustre_rep_swabbed(open_req, DLM_REPLY_REC_OFF));
/* outgoing messages always in my byte order */
LASSERT(body != NULL);
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 0c3c4282032c8badb6b7e7ae94c8ff123335b7fd..7dea5eec64ebb23a77b5c8e177cb1714b868eb03 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -790,8 +790,8 @@ static int mds_getattr_pack_msg(struct ptlrpc_request *req, struct inode *inode,
LASSERT(offset == REQ_REC_OFF); /* non-intent */
body = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*body));
- LASSERT(body != NULL); /* checked by caller */
- LASSERT_REQSWABBED(req, offset); /* swabbed by caller */
+ LASSERT(body != NULL); /* checked by caller */
+ LASSERT(lustre_req_swabbed(req, offset)); /* swabbed by caller */
if ((S_ISREG(inode->i_mode) && (body->valid & OBD_MD_FLEASIZE)) ||
(S_ISDIR(inode->i_mode) && (body->valid & OBD_MD_FLDIREA))) {
@@ -893,7 +893,7 @@ static int mds_getattr_lock(struct ptlrpc_request *req, int offset,
RETURN(-EFAULT);
}
- LASSERT_REQSWAB(req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (name == NULL) {
CERROR("Can't unpack name\n");
diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index 82bd53b1eae1ddf199ef3553742d02f0ff079ed0..d777cd8550ea0639e2292c97c0ba8ab75db90f84 100644
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -139,7 +139,7 @@ static int mds_setattr_unpack(struct ptlrpc_request *req, int offset,
LTIME_S(attr->ia_ctime) = rec->sa_ctime;
r->ur_flags = rec->sa_attr_flags;
- LASSERT_REQSWAB (req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_eadatalen = lustre_msg_buflen(req->rq_reqmsg, offset + 1);
if (r->ur_eadatalen) {
r->ur_eadata = lustre_msg_buf(req->rq_reqmsg, offset + 1, 0);
@@ -185,13 +185,13 @@ static int mds_create_unpack(struct ptlrpc_request *req, int offset,
r->ur_time = rec->cr_time;
r->ur_flags = rec->cr_flags;
- LASSERT_REQSWAB(req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (r->ur_name == NULL)
RETURN (-EFAULT);
r->ur_namelen = lustre_msg_buflen(req->rq_reqmsg, offset + 1);
- LASSERT_REQSWAB(req, offset + 2);
+ lustre_set_req_swabbed(req, offset + 2);
r->ur_tgtlen = lustre_msg_buflen(req->rq_reqmsg, offset + 2);
if (r->ur_tgtlen) {
/* NB for now, we only seem to pass NULL terminated symlink
@@ -235,7 +235,7 @@ static int mds_link_unpack(struct ptlrpc_request *req, int offset,
r->ur_fid2 = &rec->lk_fid2;
r->ur_time = rec->lk_time;
- LASSERT_REQSWAB(req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (r->ur_name == NULL)
RETURN (-EFAULT);
@@ -271,7 +271,7 @@ static int mds_unlink_unpack(struct ptlrpc_request *req, int offset,
r->ur_fid2 = &rec->ul_fid2;
r->ur_time = rec->ul_time;
- LASSERT_REQSWAB(req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (r->ur_name == NULL)
RETURN(-EFAULT);
@@ -307,13 +307,13 @@ static int mds_rename_unpack(struct ptlrpc_request *req, int offset,
r->ur_fid2 = &rec->rn_fid2;
r->ur_time = rec->rn_time;
- LASSERT_REQSWAB (req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (r->ur_name == NULL)
RETURN(-EFAULT);
r->ur_namelen = lustre_msg_buflen(req->rq_reqmsg, offset + 1);
- LASSERT_REQSWAB (req, offset + 2);
+ lustre_set_req_swabbed(req, offset + 2);
r->ur_tgt = lustre_msg_string(req->rq_reqmsg, offset + 2, 0);
if (r->ur_tgt == NULL)
RETURN(-EFAULT);
@@ -351,13 +351,13 @@ static int mds_open_unpack(struct ptlrpc_request *req, int offset,
r->ur_time = rec->cr_time;
r->ur_flags = rec->cr_flags;
- LASSERT_REQSWAB(req, offset + 1);
+ lustre_set_req_swabbed(req, offset + 1);
r->ur_name = lustre_msg_string(req->rq_reqmsg, offset + 1, 0);
if (r->ur_name == NULL)
RETURN(-EFAULT);
r->ur_namelen = lustre_msg_buflen(req->rq_reqmsg, offset + 1);
- LASSERT_REQSWAB(req, offset + 2);
+ lustre_set_req_swabbed(req, offset + 2);
r->ur_eadatalen = lustre_msg_buflen(req->rq_reqmsg, offset + 2);
if (r->ur_eadatalen) {
r->ur_eadata = lustre_msg_buf(req->rq_reqmsg, offset + 2, 0);
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 955caa1b6a36f869e188a7fa5b01c9a7e4df44b5..f145d8940a757321b612d99174cac0062398fe6d 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -2757,7 +2757,7 @@ static int osc_enqueue_fini(struct ptlrpc_request *req, struct obd_info *oinfo,
struct ldlm_reply *rep;
/* swabbed by ldlm_cli_enqueue() */
- LASSERT_REPSWABBED(req, DLM_LOCKREPLY_OFF);
+ LASSERT(lustre_rep_swabbed(req, DLM_LOCKREPLY_OFF));
rep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF,
sizeof(*rep));
LASSERT(rep != NULL);
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 81e70914e9fbf8c94503f9885da32c2b11d74a87..ee9d24a34e5c692e6f6894e34e0e5c534f8826dd 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -939,7 +939,7 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
GOTO(out, rc = -EFAULT);
}
- LASSERT_REQSWAB(req, REQ_REC_OFF + 1);
+ lustre_set_req_swabbed(req, REQ_REC_OFF + 1);
objcount = lustre_msg_buflen(req->rq_reqmsg, REQ_REC_OFF + 1) /
sizeof(*ioo);
if (objcount == 0) {
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index d6e0f8fc70e75384f1496daf68f86088dab79144..b7ce82b9d6cfecf4f604fb29483db2d52a92c485 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1041,14 +1041,14 @@ void *lustre_swab_buf(struct lustre_msg *msg, int index, int min_size,
void *lustre_swab_reqbuf(struct ptlrpc_request *req, int index, int min_size,
void *swabber)
{
- LASSERT_REQSWAB(req, index);
+ lustre_set_req_swabbed(req, index);
return lustre_swab_buf(req->rq_reqmsg, index, min_size, swabber);
}
void *lustre_swab_repbuf(struct ptlrpc_request *req, int index, int min_size,
void *swabber)
{
- LASSERT_REPSWAB(req, index);
+ lustre_set_rep_swabbed(req, index);
return lustre_swab_buf(req->rq_repmsg, index, min_size, swabber);
}
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 275ebe89e19bb51c942d23ae9a1468828e6880df..450643497e56f4bbdf4d2d5bbe5e232c2f1c3ecc 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -848,10 +848,9 @@ ptlrpc_server_handle_req_in(struct ptlrpc_service *svc)
concerned */
spin_unlock(&svc->srv_lock);
-#if SWAB_PARANOIA
/* Clear request swab mask; this is a new request */
req->rq_req_swab_mask = 0;
-#endif
+
rc = lustre_unpack_msg(req->rq_reqmsg, req->rq_reqlen);
if (rc != 0) {
CERROR ("error unpacking request: ptl %d from %s"