summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cdfbc72)
Make oxe_buflen, oxe_namelen and oxe_vallen unsigned in
struct osp_xattr_entry.
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I087772016b52d8f14d60c83dcf4a1923cca76df0
Reviewed-on: http://review.whamcloud.com/11315
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
struct list_head oxe_list;
atomic_t oxe_ref;
void *oxe_value;
struct list_head oxe_list;
atomic_t oxe_ref;
void *oxe_value;
- int oxe_buflen;
- int oxe_namelen;
- int oxe_vallen;
+ size_t oxe_buflen;
+ size_t oxe_namelen;
+ size_t oxe_vallen;
unsigned int oxe_exist:1,
oxe_ready:1;
char oxe_buf[0];
unsigned int oxe_exist:1,
oxe_ready:1;
char oxe_buf[0];
static struct osp_xattr_entry *
osp_oac_xattr_find_locked(struct osp_object_attr *ooa,
static struct osp_xattr_entry *
osp_oac_xattr_find_locked(struct osp_object_attr *ooa,
- const char *name, int namelen, bool unlink)
+ const char *name, size_t namelen, bool unlink)
{
struct osp_xattr_entry *oxe;
{
struct osp_xattr_entry *oxe;
}
static struct osp_xattr_entry *
}
static struct osp_xattr_entry *
-osp_oac_xattr_find_or_add(struct osp_object *obj, const char *name, int len)
+osp_oac_xattr_find_or_add(struct osp_object *obj, const char *name, size_t len)
{
struct osp_object_attr *ooa = obj->opo_ooa;
struct osp_xattr_entry *oxe;
struct osp_xattr_entry *tmp = NULL;
{
struct osp_object_attr *ooa = obj->opo_ooa;
struct osp_xattr_entry *oxe;
struct osp_xattr_entry *tmp = NULL;
- int namelen = strlen(name);
- int size = sizeof(*oxe) + namelen + 1 + len;
+ size_t namelen = strlen(name);
+ size_t size = sizeof(*oxe) + namelen + 1 + len;
static struct osp_xattr_entry *
osp_oac_xattr_replace(struct osp_object *obj,
static struct osp_xattr_entry *
osp_oac_xattr_replace(struct osp_object *obj,
- struct osp_xattr_entry **poxe, int len)
+ struct osp_xattr_entry **poxe, size_t len)
{
struct osp_object_attr *ooa = obj->opo_ooa;
struct osp_xattr_entry *old = *poxe;
struct osp_xattr_entry *oxe;
struct osp_xattr_entry *tmp = NULL;
{
struct osp_object_attr *ooa = obj->opo_ooa;
struct osp_xattr_entry *old = *poxe;
struct osp_xattr_entry *oxe;
struct osp_xattr_entry *tmp = NULL;
- int namelen = old->oxe_namelen;
- int size = sizeof(*oxe) + namelen + 1 + len;
+ size_t namelen = old->oxe_namelen;
+ size_t size = sizeof(*oxe) + namelen + 1 + len;
LASSERT(ooa != NULL);
if (rc == 0) {
LASSERT(ooa != NULL);
if (rc == 0) {
- int len = sizeof(*oxe) + oxe->oxe_namelen + 1;
+ size_t len = sizeof(*oxe) + oxe->oxe_namelen + 1;
rc = object_update_result_data_get(reply, rbuf, index);
if (rc < 0 || rbuf->lb_len > (oxe->oxe_buflen - len)) {
rc = object_update_result_data_get(reply, rbuf, index);
if (rc < 0 || rbuf->lb_len > (oxe->oxe_buflen - len)) {
count = atomic_read(&oxe->oxe_ref);
LASSERTF(count == 1,
"Still has %d users on the xattr entry %.*s\n",
count = atomic_read(&oxe->oxe_ref);
LASSERTF(count == 1,
"Still has %d users on the xattr entry %.*s\n",
- count - 1, oxe->oxe_namelen, oxe->oxe_buf);
+ count-1, (int)oxe->oxe_namelen, oxe->oxe_buf);
OBD_FREE(oxe, oxe->oxe_buflen);
}
OBD_FREE(oxe, oxe->oxe_buflen);
}