From 18b6d7ce7d490e807815270918a17a4b392a829d Mon Sep 17 00:00:00 2001 From: Raghavendra Gowdappa Date: Fri, 16 Nov 2018 16:27:17 +0530 Subject: libglusterfs: rename macros roof and floor to not conflict with math.h Change-Id: I666eeb63ebd000711b3f793b948d4e0c04b1a242 Signed-off-by: Raghavendra Gowdappa Updates: bz#1644629 --- xlators/performance/io-cache/src/io-cache.c | 4 ++-- xlators/performance/io-cache/src/page.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/performance/io-cache/src') diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c index 380ba876cba..6705128087e 100644 --- a/xlators/performance/io-cache/src/io-cache.c +++ b/xlators/performance/io-cache/src/io-cache.c @@ -926,8 +926,8 @@ ioc_dispatch_requests(call_frame_t *frame, ioc_inode_t *ioc_inode, fd_t *fd, local = frame->local; table = ioc_inode->table; - rounded_offset = floor(offset, table->page_size); - rounded_end = roof(offset + size, table->page_size); + rounded_offset = gf_floor(offset, table->page_size); + rounded_end = gf_roof(offset + size, table->page_size); trav_offset = rounded_offset; /* once a frame does read, it should be waiting on something */ diff --git a/xlators/performance/io-cache/src/page.c b/xlators/performance/io-cache/src/page.c index c376ade0fba..d2cbe2499a4 100644 --- a/xlators/performance/io-cache/src/page.c +++ b/xlators/performance/io-cache/src/page.c @@ -42,7 +42,7 @@ __ioc_page_get(ioc_inode_t *ioc_inode, off_t offset) table = ioc_inode->table; GF_VALIDATE_OR_GOTO("io-cache", ioc_inode, out); - rounded_offset = floor(offset, table->page_size); + rounded_offset = gf_floor(offset, table->page_size); page = rbthash_get(ioc_inode->cache.page_table, &rounded_offset, sizeof(rounded_offset)); @@ -253,7 +253,7 @@ __ioc_page_create(ioc_inode_t *ioc_inode, off_t offset) table = ioc_inode->table; GF_VALIDATE_OR_GOTO("io-cache", table, out); - rounded_offset = floor(offset, table->page_size); + rounded_offset = gf_floor(offset, table->page_size); newpage = GF_CALLOC(1, sizeof(*newpage), gf_ioc_mt_ioc_newpage_t); if (newpage == NULL) { -- cgit