diff options
| author | shishir gowda <shishirng@gluster.com> | 2011-07-29 16:30:36 +0530 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-31 23:15:15 -0700 |
| commit | 76acac485b9f06f36d145b4c31fa6f4da3c70f52 (patch) | |
| tree | 8d3bcc7f3cbb0e498f77a7d6998a9e7865a234ad /libglusterfs/src/fd.c | |
| parent | 9867f3954138e795123b4b308e256e641c55f3ec (diff) | |
IOBUF: Bring in variable iobuf support
Rebasing Raghavendra's patch to master
Change-Id: Ie7a0c9a7b8e73cfe48c4573a5153460d5126208e
BUG: 2472
Reviewed-on: http://review.gluster.com/12
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amar@gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>
Diffstat (limited to 'libglusterfs/src/fd.c')
| -rw-r--r-- | libglusterfs/src/fd.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index bbb774be4..2a1dcb789 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -37,27 +37,6 @@ gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr); fd_t * _fd_ref (fd_t *fd); -/* - Allocate in memory chunks of power of 2 starting from 1024B - Assumes fdtable->lock is held -*/ -static inline int -gf_roundup_power_of_two (uint32_t nr) -{ - uint32_t result = 1; - - if (nr < 0) { - gf_log ("fd", GF_LOG_ERROR, "negative number passed"); - return -1; - } - - while (result <= nr) - result *= 2; - - return result; -} - - static int gf_fd_chain_fd_entries (fdentry_t *entries, uint32_t startidx, uint32_t endcount) @@ -96,7 +75,7 @@ gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr) } nr /= (1024 / sizeof (fdentry_t)); - nr = gf_roundup_power_of_two (nr + 1); + nr = gf_roundup_next_power_of_two (nr + 1); nr *= (1024 / sizeof (fdentry_t)); oldfds = fdtable->fdentries; |