LU-3963 Revert bitops changes

[fs/lustre-release.git] / libcfs / libcfs / user-bitops.c

diff --git a/libcfs/libcfs/user-bitops.c b/libcfs/libcfs/user-bitops.c
index d887050..65f2da9 100644 (file)
--- a/libcfs/libcfs/user-bitops.c
+++ b/libcfs/libcfs/user-bitops.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,7 +40,7 @@
 
 #define OFF_BY_START(start)     ((start)/BITS_PER_LONG)
 
-unsigned long cfs_find_next_bit(unsigned long *addr,
+unsigned long find_next_bit(unsigned long *addr,
                                 unsigned long size, unsigned long offset)
 {
         unsigned long *word, *last;
@@ -74,7 +74,7 @@ found:
         return base + bit;
 }
 
-unsigned long cfs_find_next_zero_bit(unsigned long *addr,
+unsigned long find_next_zero_bit(unsigned long *addr,
                                      unsigned long size, unsigned long offset)
 {
         unsigned long *word, *last;
@@ -89,7 +89,7 @@ unsigned long cfs_find_next_zero_bit(unsigned long *addr,
                 return size;
         if (first_bit != 0) {
                 int tmp = (*word++) & (~0UL << first_bit);
-                bit = __cfs_ffz(tmp);
+                bit = ffz(tmp);
                 if (bit < BITS_PER_LONG)
                         goto found;
                 word++;
@@ -97,7 +97,7 @@ unsigned long cfs_find_next_zero_bit(unsigned long *addr,
         }
         while (word <= last) {
                 if (*word != ~0UL) {
-                        bit = __cfs_ffz(*word);
+                        bit = ffz(*word);
                         goto found;
                 }
                 word++;