From b12ebc65e82de1cc6174b65c79266dd0f0a4fbf3 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 21 May 2007 11:42:33 +0200 Subject: [PATCH] Rename ffz() function to fio_ffz() to avoid conflicts Newer gcc/glibc include an ffz function. Lets just do the easy thing and rename ours to fio_ffz(), then we can look into reusing a provided one later if necessary. Signed-off-by: Jens Axboe --- arch/arch-alpha.h | 4 ++-- arch/arch-ia64.h | 2 +- arch/arch-ppc.h | 2 +- arch/arch-s390.h | 4 ++-- arch/arch-x86.h | 2 +- arch/arch-x86_64.h | 2 +- io_u.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arch-alpha.h b/arch/arch-alpha.h index 09293bd3..b899494f 100644 --- a/arch/arch-alpha.h +++ b/arch/arch-alpha.h @@ -12,7 +12,7 @@ #define __NR_fadvise64 413 #endif -#define nop do { } while (0) -#define ffz(v) generic_ffz((v)) +#define nop do { } while (0) +#define fio_ffz(v) generic_ffz((v)) #endif diff --git a/arch/arch-ia64.h b/arch/arch-ia64.h index b3ee0c38..7baccca5 100644 --- a/arch/arch-ia64.h +++ b/arch/arch-ia64.h @@ -27,7 +27,7 @@ ia64_intri_res; \ }) -static inline unsigned long ffz(unsigned long bitmask) +static inline unsigned long fio_ffz(unsigned long bitmask) { return ia64_popcnt(bitmask & (~bitmask - 1)); } diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h index 8bfed597..0a23c01a 100644 --- a/arch/arch-ppc.h +++ b/arch/arch-ppc.h @@ -28,7 +28,7 @@ static inline int __ilog2(unsigned long bitmask) return 31 - lz; } -static inline int ffz(unsigned long bitmask) +static inline int fio_ffz(unsigned long bitmask) { if ((bitmask = ~bitmask) == 0) return 32; diff --git a/arch/arch-s390.h b/arch/arch-s390.h index b7048ad6..ed5d462d 100644 --- a/arch/arch-s390.h +++ b/arch/arch-s390.h @@ -12,7 +12,7 @@ #define __NR_fadvise64 253 #endif -#define nop asm volatile ("diag 0,0,68" : : : "memory") -#define ffz(v) generic_ffz((v)) +#define nop asm volatile ("diag 0,0,68" : : : "memory") +#define fio_ffz(v) generic_ffz((v)) #endif diff --git a/arch/arch-x86.h b/arch/arch-x86.h index aa106920..574383a6 100644 --- a/arch/arch-x86.h +++ b/arch/arch-x86.h @@ -31,7 +31,7 @@ #define nop __asm__ __volatile__("rep;nop": : :"memory") -static inline unsigned long ffz(unsigned long bitmask) +static inline unsigned long fio_ffz(unsigned long bitmask) { __asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask)); return bitmask; diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h index 4e0ad5f6..fabdb9ad 100644 --- a/arch/arch-x86_64.h +++ b/arch/arch-x86_64.h @@ -31,7 +31,7 @@ #define nop __asm__ __volatile__("rep;nop": : :"memory") -static inline unsigned long ffz(unsigned long bitmask) +static inline unsigned long fio_ffz(unsigned long bitmask) { __asm__("bsfq %1,%0" :"=r" (bitmask) :"r" (~bitmask)); return bitmask; diff --git a/io_u.c b/io_u.c index 7fe5242f..e892ec75 100644 --- a/io_u.c +++ b/io_u.c @@ -84,7 +84,7 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f, *b = (i * BLOCKS_PER_MAP); while ((*b) * td->o.rw_min_bs < f->real_file_size) { if (f->file_map[i] != -1UL) { - *b += ffz(f->file_map[i]); + *b += fio_ffz(f->file_map[i]); f->last_free_lookup = i; return 0; } -- 2.25.1