Rename fls() to __fls()

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/fls.h b/fls.h
index 850859bc5069a0a772a8772ffbed1571976762b2..dc7ecd0d629c94afe22a599739e76d68cb39922c 100644 (file)
--- a/fls.h
+++ b/fls.h
@@ -9,7 +9,7 @@
  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
  */
 
-static inline int fls(int x)
+static inline int __fls(int x)
 {
        int r = 32;
 

diff --git a/options.c b/options.c
index cc131a288c1b2f5244bc279dfdffa6031017e39d..3c37e9105698cbabb0f46d66816de93762d8cd3e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -406,7 +406,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
        struct thread_data *td = data;
        unsigned int msb;
 
-       msb = fls(*off);
+       msb = __fls(*off);
        if (msb <= 8)
                td->o.verify_pattern_bytes = 1;
        else if (msb <= 16)