* 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
Details : change mgsnode
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)
{
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");
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) {
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 {
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++)
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");
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);
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;
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
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);
}
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;
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;
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
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");
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)
}
/* 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) {
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;
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 */
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,
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) {
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)
/* 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);
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))) {
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");
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);
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
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);
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);
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);
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);
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);
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) {
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);
}
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"
git://git.whamcloud.com / fs / lustre-release.git / commitdiff