Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4416 tests: small fixes for conf_sanity
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-bitops.c
diff --git
a/libcfs/libcfs/user-bitops.c
b/libcfs/libcfs/user-bitops.c
index
4a266d3
..
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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,8
+24,10
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-40,7
+40,7
@@
#define OFF_BY_START(start) ((start)/BITS_PER_LONG)
#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;
unsigned long size, unsigned long offset)
{
unsigned long *word, *last;
@@
-74,7
+74,7
@@
found:
return base + bit;
}
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;
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);
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++;
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) {
}
while (word <= last) {
if (*word != ~0UL) {
- bit =
__cfs_
ffz(*word);
+ bit = ffz(*word);
goto found;
}
word++;
goto found;
}
word++;