|
@@ -1124,15 +1124,18 @@ struct reiserfs_de_head {
|
|
|
# define aligned_address(addr) ((void *)((long)(addr) & ~((1UL << ADDR_UNALIGNED_BITS) - 1)))
|
|
|
# define unaligned_offset(addr) (((int)((long)(addr) & ((1 << ADDR_UNALIGNED_BITS) - 1))) << 3)
|
|
|
|
|
|
-# define set_bit_unaligned(nr, addr) ext2_set_bit((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
-# define clear_bit_unaligned(nr, addr) ext2_clear_bit((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
-# define test_bit_unaligned(nr, addr) ext2_test_bit((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
+# define set_bit_unaligned(nr, addr) \
|
|
|
+ __test_and_set_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
+# define clear_bit_unaligned(nr, addr) \
|
|
|
+ __test_and_clear_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
+# define test_bit_unaligned(nr, addr) \
|
|
|
+ test_bit_le((nr) + unaligned_offset(addr), aligned_address(addr))
|
|
|
|
|
|
#else
|
|
|
|
|
|
-# define set_bit_unaligned(nr, addr) ext2_set_bit(nr, addr)
|
|
|
-# define clear_bit_unaligned(nr, addr) ext2_clear_bit(nr, addr)
|
|
|
-# define test_bit_unaligned(nr, addr) ext2_test_bit(nr, addr)
|
|
|
+# define set_bit_unaligned(nr, addr) __test_and_set_bit_le(nr, addr)
|
|
|
+# define clear_bit_unaligned(nr, addr) __test_and_clear_bit_le(nr, addr)
|
|
|
+# define test_bit_unaligned(nr, addr) test_bit_le(nr, addr)
|
|
|
|
|
|
#endif
|
|
|
|
|
@@ -2329,14 +2332,10 @@ __u32 keyed_hash(const signed char *msg, int len);
|
|
|
__u32 yura_hash(const signed char *msg, int len);
|
|
|
__u32 r5_hash(const signed char *msg, int len);
|
|
|
|
|
|
-/* the ext2 bit routines adjust for big or little endian as
|
|
|
-** appropriate for the arch, so in our laziness we use them rather
|
|
|
-** than using the bit routines they call more directly. These
|
|
|
-** routines must be used when changing on disk bitmaps. */
|
|
|
-#define reiserfs_test_and_set_le_bit ext2_set_bit
|
|
|
-#define reiserfs_test_and_clear_le_bit ext2_clear_bit
|
|
|
-#define reiserfs_test_le_bit ext2_test_bit
|
|
|
-#define reiserfs_find_next_zero_le_bit ext2_find_next_zero_bit
|
|
|
+#define reiserfs_test_and_set_le_bit __test_and_set_bit_le
|
|
|
+#define reiserfs_test_and_clear_le_bit __test_and_clear_bit_le
|
|
|
+#define reiserfs_test_le_bit test_bit_le
|
|
|
+#define reiserfs_find_next_zero_le_bit find_next_zero_bit_le
|
|
|
|
|
|
/* sometimes reiserfs_truncate may require to allocate few new blocks
|
|
|
to perform indirect2direct conversion. People probably used to
|