return nr;
}
-static __inline__ int test_bit(int nr, long * addr)
+static __inline__ int test_bit(int nr, const long * addr)
{
return ((1UL << (nr & (BITS_PER_LONG - 1))) & ((addr)[nr / BITS_PER_LONG])) != 0;
}
#include <assert.h>
#include <libcfs/list.h>
-#include <libcfs/user-bitops.h>
#include <lnet/lnet.h>
#include <libcfs/kp30.h>
+#include <libcfs/user-bitops.h>
/* definitions for liblustre */
* to allow the compiler to adjust the bit shifting accordingly
*/
-/* test if bit nr is set in bitmap addr; returns previous value of bit nr */
-static __inline__ int set_bit(int nr, long * addr)
-{
- long mask;
-
- addr += nr / BITS_PER_LONG;
- mask = 1UL << (nr & (BITS_PER_LONG - 1));
- nr = (mask & *addr) != 0;
- *addr |= mask;
- return nr;
-}
-
-/* clear bit nr in bitmap addr; returns previous value of bit nr*/
-static __inline__ int clear_bit(int nr, long * addr)
-{
- long mask;
-
- addr += nr / BITS_PER_LONG;
- mask = 1UL << (nr & (BITS_PER_LONG - 1));
- nr = (mask & *addr) != 0;
- *addr &= ~mask;
- return nr;
-}
-
-static __inline__ int test_bit(int nr, const long * addr)
-{
- return ((1UL << (nr & (BITS_PER_LONG - 1))) & ((addr)[nr / BITS_PER_LONG])) != 0;
-}
-
static __inline__ int ext2_set_bit(int nr, void *addr)
{
return set_bit(nr, (long*)addr);
" old %llu\n", i, id, data[idx]);
if (id > data[idx]) {
data[idx] = id;
- bitmap_set(mds->mds_lov_page_dirty, page);
+ cfs_bitmap_set(mds->mds_lov_page_dirty, page);
}
}
EXIT;
int i, rc = 0;
ENTRY;
- if (bitmap_check_empty(mds->mds_lov_page_dirty))
+ if (cfs_bitmap_check_empty(mds->mds_lov_page_dirty))
RETURN(0);
mds_lov_dump_objids("write", obd);
- foreach_bit(mds->mds_lov_page_dirty, i) {
+ cfs_foreach_bit(mds->mds_lov_page_dirty, i) {
obd_id *data = mds->mds_lov_page_array[i];
unsigned int size = OBJID_PER_PAGE()*sizeof(obd_id);
loff_t off = i * size;
size, &off, 0);
if (rc < 0)
break;
- bitmap_clear(mds->mds_lov_page_dirty, i);
+ cfs_bitmap_clear(mds->mds_lov_page_dirty, i);
}
if (rc >= 0)
rc = 0;
mds->mds_lov_objid_lastpage = page;
mds->mds_lov_objid_lastidx = off;
}
- bitmap_set(mds->mds_lov_page_dirty, page);
+ cfs_bitmap_set(mds->mds_lov_page_dirty, page);
}
out:
RETURN(rc);