From f32378b660dab5f3f311da8252969a7da16898f4 Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Mon, 15 Sep 2014 11:57:43 +0200 Subject: ec: Fix some size_t vars to 64 bits even on 32 bits machines The 64 bits 'trusted.ec.size' extended attribute was incorrectly computed on 32 bits machines due to an overflow on negative numbers. Also changed some potentially dangerous uses of size_t in other places. Change-Id: Id76cfe49a2f350e564b5c71d8c8644fb9ce86662 BUG: 1125312 Signed-off-by: Xavier Hernandez Reviewed-on: http://review.gluster.org/8738 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/ec/src/ec-helpers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/cluster/ec/src/ec-helpers.h') diff --git a/xlators/cluster/ec/src/ec-helpers.h b/xlators/cluster/ec/src/ec-helpers.h index 6625ade4b08..3010ea856de 100644 --- a/xlators/cluster/ec/src/ec-helpers.h +++ b/xlators/cluster/ec/src/ec-helpers.h @@ -53,7 +53,7 @@ ec_inode_t * ec_inode_get(inode_t * inode, xlator_t * xl); ec_fd_t * __ec_fd_get(fd_t * fd, xlator_t * xl); ec_fd_t * ec_fd_get(fd_t * fd, xlator_t * xl); -size_t ec_adjust_offset(ec_t * ec, off_t * offset, int32_t scale); -size_t ec_adjust_size(ec_t * ec, size_t size, int32_t scale); +uint32_t ec_adjust_offset(ec_t * ec, off_t * offset, int32_t scale); +uint64_t ec_adjust_size(ec_t * ec, uint64_t size, int32_t scale); #endif /* __EC_HELPERS_H__ */ -- cgit