diff options
author | Xavi Hernandez <xhernandez@redhat.com> | 2018-09-25 13:22:47 +0200 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-10-10 05:50:29 +0000 |
commit | 2d96ce8faa277809c0c94aca54320483889f577d (patch) | |
tree | 999ef8b148b186e6bf74bb22c3ff670fc6e34d38 /xlators/storage/bd | |
parent | 0cda00f08d3d620be89830bad9d0e252648388e9 (diff) |
all: fix warnings on non 64-bits architectures
When compiling in other architectures there appear many warnings. Some
of them are actual problems that prevent gluster to work correctly on
those architectures.
Change-Id: Icdc7107a2bc2da662903c51910beddb84bdf03c0
fixes: bz#1632717
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
Diffstat (limited to 'xlators/storage/bd')
-rw-r--r-- | xlators/storage/bd/src/bd-helper.c | 2 | ||||
-rw-r--r-- | xlators/storage/bd/src/bd.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c index 895c6500acf..c6891749008 100644 --- a/xlators/storage/bd/src/bd-helper.c +++ b/xlators/storage/bd/src/bd-helper.c @@ -331,7 +331,7 @@ bd_validate_bd_xattr(xlator_t *this, char *bd, char **type, uint64_t *lv_size, if (bytes) { *bytes = '\0'; bytes++; - gf_string2bytesize(bytes, &size); + gf_string2bytesize_uint64(bytes, &size); } if (strcmp(bd, BD_LV) && strcmp(bd, BD_THIN)) { diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c index 0b399157238..0a29a99181b 100644 --- a/xlators/storage/bd/src/bd.c +++ b/xlators/storage/bd/src/bd.c @@ -1025,7 +1025,7 @@ bd_setx_stat_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, if (!s_size) size = bd_get_default_extent(priv); else - gf_string2bytesize(s_size, &size); + gf_string2bytesize_uint64(s_size, &size); gf_asprintf(&bd, "%s:%ld", type, size); BD_VALIDATE_MEM_ALLOC(bd, op_errno, out); @@ -1146,7 +1146,7 @@ bd_offload_getx_cbk(call_frame_t *frame, void *cookie, xlator_t *this, /* For clone size is taken from source LV */ if (!local->size) { p++; - gf_string2bytesize(p, &local->size); + gf_string2bytesize_uint64(p, &local->size); } gf_asprintf(&bd, "%s:%ld", type, local->size); local->bdatt->type = gf_strdup(type); @@ -1312,7 +1312,7 @@ bd_offload(call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, gfid = strtok_r(param, ":", &p); size = strtok_r(NULL, ":", &p); if (size) - gf_string2bytesize(size, &local->size); + gf_string2bytesize_uint64(size, &local->size); else if (offload != BD_OF_CLONE) local->size = bd_get_default_extent(this->private); |