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/experimental | |
| 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/experimental')
| -rw-r--r-- | xlators/experimental/fdl/src/fdl-tmpl.c.in | 5 | ||||
| -rwxr-xr-x | xlators/experimental/fdl/src/gen_dumper.py | 6 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/jbr.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/xlators/experimental/fdl/src/fdl-tmpl.c.in b/xlators/experimental/fdl/src/fdl-tmpl.c.in index 7388b83e0bc..c99157be957 100644 --- a/xlators/experimental/fdl/src/fdl-tmpl.c.in +++ b/xlators/experimental/fdl/src/fdl-tmpl.c.in @@ -92,7 +92,7 @@ fdl_open_term_log(xlator_t *this, log_obj_t *obj, int term) goto err; } - gf_log(this->name, GF_LOG_INFO, "opening %s (size %ld)", obj->path, + gf_log(this->name, GF_LOG_INFO, "opening %s (size %" PRId64 ")", obj->path, obj->size); obj->fd = open(obj->path, O_RDWR | O_CREAT | O_TRUNC, 0666); @@ -159,7 +159,8 @@ fdl_close_term_log(xlator_t *this, log_obj_t *obj) } if (obj->fd >= 0) { - gf_log(this->name, GF_LOG_INFO, "truncating term %d %s journal to %ld", + gf_log(this->name, GF_LOG_INFO, + "truncating term %d %s journal to %" PRId64, priv->term, obj->type, obj->max_offset); if (sys_ftruncate(obj->fd, obj->max_offset) < 0) { gf_log(this->name, GF_LOG_WARNING, diff --git a/xlators/experimental/fdl/src/gen_dumper.py b/xlators/experimental/fdl/src/gen_dumper.py index 15221544b1c..630b54492f7 100755 --- a/xlators/experimental/fdl/src/gen_dumper.py +++ b/xlators/experimental/fdl/src/gen_dumper.py @@ -48,12 +48,12 @@ from generator import ops, fop_subs, cbk_subs, generate typemap = { 'dict_t *': ( "DICT", ""), 'fd_t *': ( "GFID", ""), - 'dev_t': ( "DOUBLE", "%ld (0x%lx)"), + 'dev_t': ( "DOUBLE", "%\"PRId64\" (0x%\"PRIx64\")"), 'gf_xattrop_flags_t': ( "INTEGER", "%d (0x%x)"), 'int32_t': ( "INTEGER", "%d (0x%x)"), 'mode_t': ( "INTEGER", "%d (0x%x)"), - 'off_t': ( "DOUBLE", "%ld (0x%lx)"), - 'size_t': ( "DOUBLE", "%ld (0x%lx)"), + 'off_t': ( "DOUBLE", "%\"PRId64\" (0x%\"PRIx64\")"), + 'size_t': ( "DOUBLE", "%\"PRId64\" (0x%\"PRIx64\")"), 'uint32_t': ( "INTEGER", "%d (0x%x)"), 'loc_t *': ( "LOC", ""), 'const char *': ( "STRING", ""), diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index 49d7eb467f7..31df6ad5a1e 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -142,7 +142,7 @@ jbr_get_fd_ctx(xlator_t *this, fd_t *fd) } else { ctx_ptr = GF_CALLOC(1, sizeof(*ctx_ptr), gf_mt_jbr_fd_ctx_t); if (ctx_ptr) { - if (__fd_ctx_set(fd, this, (uint64_t)ctx_ptr) == 0) { + if (__fd_ctx_set(fd, this, (uint64_t)(uintptr_t)ctx_ptr) == 0) { INIT_LIST_HEAD(&ctx_ptr->dirty_list); INIT_LIST_HEAD(&ctx_ptr->fd_list); } else { |