#define MKSTR(ptr) ((ptr))? (ptr) : ""
-static inline size_t cfs_size_round4(size_t val)
-{
- return (val + 3) & (~0x3);
-}
-
#ifndef HAVE_CFS_SIZE_ROUND
static inline size_t cfs_size_round(size_t val)
{
#define HAVE_CFS_SIZE_ROUND
#endif
-static inline size_t cfs_size_round16(size_t val)
-{
- return (val + 0xf) & (~0xf);
-}
-
-static inline size_t cfs_size_round32(size_t val)
-{
- return (val + 0x1f) & (~0x1f);
-}
-
-static inline size_t cfs_size_round0(size_t val)
-{
- if (!val)
- return 0;
- return (val + 1 + 7) & (~0x7);
-}
-
-static inline size_t cfs_round_strlen(char *fset)
-{
- return cfs_size_round(strlen(fset) + 1);
-}
-
#endif
CERROR("can't copy token\n");
return -EFAULT;
}
- size -= sizeof(__u32) + cfs_size_round4(token_size);
+ size -= sizeof(__u32) + round_up(token_size, 4);
req->rq_reqdata_len = lustre_shrink_msg(req->rq_reqbuf, offset,
msg->lm_buflens[offset] - size, 0);
return -EPROTO;
}
- if (outlen < (4 + 2) * 4 + cfs_size_round4(ghdr->gh_handle.len) +
- cfs_size_round4(msg->lm_buflens[2])) {
+ if (outlen < (4 + 2) * 4 + round_up(ghdr->gh_handle.len, 4) +
+ round_up(msg->lm_buflens[2], 4)) {
CERROR("output buffer size %ld too small\n", outlen);
return -EFAULT;
}
LASSERT(buf);
LASSERT(buflen);
- len = cfs_size_round4(obj->len);
+ len = round_up(obj->len, 4);
if (*buflen < 4 + len) {
CERROR("shorter buflen than needed: %u < %u\n",
return 0;
}
- len = local ? obj->len : cfs_size_round4(obj->len);
+ len = local ? obj->len : round_up(obj->len, 4);
if (*buflen < len) {
CERROR("shorter buflen than object size: %u < %u\n",
*buflen, len);
}
grctx->src_init = 1;
- grctx->src_reserve_len = cfs_size_round4(rsip->out_token.len);
+ grctx->src_reserve_len = round_up(rsip->out_token.len, 4);
rc = lustre_pack_reply_v2(req, 1, &replen, NULL, 0);
if (rc) {