-#define find_first_bit(addr,size) (find_next_bit((addr),(size),0))
-#define find_first_zero_bit(addr,size) (find_next_zero_bit((addr),(size),0))
+#define cfs_find_first_bit(addr,size) (cfs_find_next_bit((addr),(size),0))
+#define cfs_find_first_zero_bit(addr,size) \
+ (cfs_find_next_zero_bit((addr),(size),0))