summaryrefslogtreecommitdiffstats
path: root/libglusterfs
diff options
context:
space:
mode:
authorYaniv Kaul <ykaul@redhat.com>2018-11-04 11:00:11 +0200
committerAmar Tumballi <amarts@redhat.com>2018-11-06 04:18:50 +0000
commitba52abc6931baecb73d690b289f8feb32205424f (patch)
tree2fa00616860d3d9803062d859c4b4767a51e0a9c /libglusterfs
parentd2b745319334a1025b9e47f55928033b8d1c7c46 (diff)
libglusterfs/src/iobuf.c: remove some if statements
Small code refactoring to remove some if statements in several functions. No functional changes expected. Compile-tested only! updates: bz#1193929 Signed-off-by: Yaniv Kaul <ykaul@redhat.com> Change-Id: If9f8d5d53c9688fb994b6d690aea66f65fa01c55
Diffstat (limited to 'libglusterfs')
-rw-r--r--libglusterfs/src/iobuf.c44
1 files changed, 19 insertions, 25 deletions
diff --git a/libglusterfs/src/iobuf.c b/libglusterfs/src/iobuf.c
index c9e0ff35198..2f1a8fe6f01 100644
--- a/libglusterfs/src/iobuf.c
+++ b/libglusterfs/src/iobuf.c
@@ -27,38 +27,32 @@ struct iobuf_init_config gf_iobuf_init_config[] = {
{32 * 1024, 64}, {128 * 1024, 32}, {256 * 1024, 8}, {1 * 1024 * 1024, 2},
};
-int
-gf_iobuf_get_arena_index(size_t page_size)
+static int
+gf_iobuf_get_arena_index(const size_t page_size)
{
- int i = -1;
+ int i;
for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
if (page_size <= gf_iobuf_init_config[i].pagesize)
- break;
+ return i;
}
- if (i >= IOBUF_ARENA_MAX_INDEX)
- i = -1;
-
- return i;
+ return -1;
}
-size_t
-gf_iobuf_get_pagesize(size_t page_size)
+static size_t
+gf_iobuf_get_pagesize(const size_t page_size)
{
- int i = 0;
+ int i;
size_t size = 0;
for (i = 0; i < IOBUF_ARENA_MAX_INDEX; i++) {
size = gf_iobuf_init_config[i].pagesize;
if (page_size <= size)
- break;
+ return size;
}
- if (i >= IOBUF_ARENA_MAX_INDEX)
- size = -1;
-
- return size;
+ return -1;
}
void
@@ -236,9 +230,9 @@ out:
return iobuf_arena;
}
-struct iobuf_arena *
-__iobuf_pool_add_arena(struct iobuf_pool *iobuf_pool, size_t page_size,
- int32_t num_pages)
+static struct iobuf_arena *
+__iobuf_pool_add_arena(struct iobuf_pool *iobuf_pool, const size_t page_size,
+ const int32_t num_pages)
{
struct iobuf_arena *iobuf_arena = NULL;
int index = 0;
@@ -254,13 +248,13 @@ __iobuf_pool_add_arena(struct iobuf_pool *iobuf_pool, size_t page_size,
iobuf_arena = __iobuf_arena_unprune(iobuf_pool, page_size);
- if (!iobuf_arena)
- iobuf_arena = __iobuf_arena_alloc(iobuf_pool, page_size, num_pages);
-
if (!iobuf_arena) {
- gf_msg(THIS->name, GF_LOG_WARNING, 0, LG_MSG_ARENA_NOT_FOUND,
- "arena not found");
- return NULL;
+ iobuf_arena = __iobuf_arena_alloc(iobuf_pool, page_size, num_pages);
+ if (!iobuf_arena) {
+ gf_msg(THIS->name, GF_LOG_WARNING, 0, LG_MSG_ARENA_NOT_FOUND,
+ "arena not found");
+ return NULL;
+ }
}
list_add(&iobuf_arena->list, &iobuf_pool->arenas[index]);