Change the type accordant usage.
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I2451940225dd30015928cf85a2e0cc0e6cc8dfeb
Reviewed-on: http://review.whamcloud.com/12383
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
return next;
}
-static inline int lu_dirent_calc_size(int namelen, __u16 attr)
+static inline size_t lu_dirent_calc_size(size_t namelen, __u16 attr)
{
- int size;
+ size_t size;
- if (attr & LUDA_TYPE) {
- const unsigned align = sizeof(struct luda_type) - 1;
+ if (attr & LUDA_TYPE) {
+ const size_t align = sizeof(struct luda_type) - 1;
size = (sizeof(struct lu_dirent) + namelen + align) & ~align;
size += sizeof(struct luda_type);
} else
return (size + 7) & ~7;
}
-static inline int lu_dirent_size(const struct lu_dirent *ent)
-{
- if (le16_to_cpu(ent->lde_reclen) == 0) {
- return lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen),
- le32_to_cpu(ent->lde_attrs));
- }
- return le16_to_cpu(ent->lde_reclen);
-}
-
#define MDS_DIR_END_OFF 0xfffffffffffffffeULL
/**
int ent_idx = 0;
struct lu_dirent *min_ent = NULL;
struct lu_dirent *last_ent;
- int left_bytes;
+ size_t left_bytes;
int rc;
ENTRY;
GOTO(out_put, rc);
do {
+ size_t lu_dirent_size;
+
rc = iops->key_size(env, it);
if (rc == 0)
goto next;
/* calculate max space required for lu_dirent */
- rc = lu_dirent_calc_size(rc, 0);
- LASSERT(rc <= sizeof(info->mti_xattr_buf));
+ lu_dirent_size = lu_dirent_calc_size(rc, 0);
+ LASSERT(lu_dirent_size <= sizeof(info->mti_xattr_buf));
rc = iops->rec(env, it, (struct dt_rec *)ent, LUDA_TYPE);
if (rc == 0) {
{
struct osd_zap_it *it = (struct osd_zap_it *)di;
zap_attribute_t *za = &osd_oti_get(env)->oti_za;
- int rc, namelen = 0;
+ size_t namelen = 0;
+ int rc;
ENTRY;
if (it->ozi_pos <= 1)
{
struct osp_it *it = (struct osp_it *)di;
struct lu_dirent *ent = (struct lu_dirent *)it->ooi_ent;
- int reclen;
+ size_t reclen;
reclen = lu_dirent_calc_size(le16_to_cpu(ent->lde_namelen), attr);
memcpy(rec, ent, reclen);