Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[cascardo/linux.git] / drivers / md / dm-log.c

diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 6951536..a1f3218 100644 (file)
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -251,20 +251,20 @@ struct log_c {
  */
 static inline int log_test_bit(uint32_t *bs, unsigned bit)
 {
-       return ext2_test_bit(bit, (unsigned long *) bs) ? 1 : 0;
+       return test_bit_le(bit, (unsigned long *) bs) ? 1 : 0;
 }
 
 static inline void log_set_bit(struct log_c *l,
                               uint32_t *bs, unsigned bit)
 {
-       ext2_set_bit(bit, (unsigned long *) bs);
+       __test_and_set_bit_le(bit, (unsigned long *) bs);
        l->touched_cleaned = 1;
 }
 
 static inline void log_clear_bit(struct log_c *l,
                                 uint32_t *bs, unsigned bit)
 {
-       ext2_clear_bit(bit, (unsigned long *) bs);
+       __test_and_clear_bit_le(bit, (unsigned long *) bs);
        l->touched_dirtied = 1;
 }
 
@@ -543,7 +543,7 @@ static int disk_ctr(struct dm_dirty_log *log, struct dm_target *ti,
                return -EINVAL;
        }
 
-       r = dm_get_device(ti, argv[0], FMODE_READ | FMODE_WRITE, &dev);
+       r = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &dev);
        if (r)
                return r;
 
@@ -740,7 +740,7 @@ static int core_get_resync_work(struct dm_dirty_log *log, region_t *region)
                return 0;
 
        do {
-               *region = ext2_find_next_zero_bit(
+               *region = find_next_zero_bit_le(
                                             (unsigned long *) lc->sync_bits,
                                             lc->region_count,
                                             lc->sync_search);