diff options
author | Raghavendra Gowdappa <rgowdapp@redhat.com> | 2018-11-16 16:27:17 +0530 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2018-11-28 15:11:59 +0000 |
commit | 18b6d7ce7d490e807815270918a17a4b392a829d (patch) | |
tree | 7ca2d0da54400db14fefc36663f360a06c4c2fc8 /xlators/performance | |
parent | 9f9f46ff2d30ff87a6a4f8c2af491ea1aa92fbb2 (diff) |
libglusterfs: rename macros roof and floor to not conflict with math.h
Change-Id: I666eeb63ebd000711b3f793b948d4e0c04b1a242
Signed-off-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
Updates: bz#1644629
Diffstat (limited to 'xlators/performance')
-rw-r--r-- | xlators/performance/io-cache/src/io-cache.c | 4 | ||||
-rw-r--r-- | xlators/performance/io-cache/src/page.c | 4 | ||||
-rw-r--r-- | xlators/performance/read-ahead/src/page.c | 4 | ||||
-rw-r--r-- | xlators/performance/read-ahead/src/read-ahead.c | 8 |
4 files changed, 10 insertions, 10 deletions
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) { diff --git a/xlators/performance/read-ahead/src/page.c b/xlators/performance/read-ahead/src/page.c index c4071393c95..87c9c2347f4 100644 --- a/xlators/performance/read-ahead/src/page.c +++ b/xlators/performance/read-ahead/src/page.c @@ -25,7 +25,7 @@ ra_page_get(ra_file_t *file, off_t offset) GF_VALIDATE_OR_GOTO("read-ahead", file, out); page = file->pages.next; - rounded_offset = floor(offset, file->page_size); + rounded_offset = gf_floor(offset, file->page_size); while (page != &file->pages && page->offset < rounded_offset) page = page->next; @@ -47,7 +47,7 @@ ra_page_create(ra_file_t *file, off_t offset) GF_VALIDATE_OR_GOTO("read-ahead", file, out); page = file->pages.next; - rounded_offset = floor(offset, file->page_size); + rounded_offset = gf_floor(offset, file->page_size); while (page != &file->pages && page->offset < rounded_offset) page = page->next; diff --git a/xlators/performance/read-ahead/src/read-ahead.c b/xlators/performance/read-ahead/src/read-ahead.c index c62bd1bb172..1822cdc0925 100644 --- a/xlators/performance/read-ahead/src/read-ahead.c +++ b/xlators/performance/read-ahead/src/read-ahead.c @@ -268,7 +268,7 @@ read_ahead(call_frame_t *frame, ra_file_t *file) } ra_size = file->page_size * file->page_count; - ra_offset = floor(file->offset, file->page_size); + ra_offset = gf_floor(file->offset, file->page_size); cap = file->size ? file->size : file->offset + ra_size; while (ra_offset < min(file->offset + ra_size, cap)) { @@ -354,8 +354,8 @@ dispatch_requests(call_frame_t *frame, ra_file_t *file) local = frame->local; conf = file->conf; - rounded_offset = floor(local->offset, file->page_size); - rounded_end = roof(local->offset + local->size, file->page_size); + rounded_offset = gf_floor(local->offset, file->page_size); + rounded_end = gf_roof(local->offset + local->size, file->page_size); trav_offset = rounded_offset; @@ -509,7 +509,7 @@ ra_readv(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, dispatch_requests(frame, file); - flush_region(frame, file, 0, floor(offset, file->page_size), 0); + flush_region(frame, file, 0, gf_floor(offset, file->page_size), 0); read_ahead(frame, file); |