Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / md / dm-raid1.c

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index ec43f9fa4b2acaffed0bf45f79edc5a115f36804..4d6bc101962e1965a1b98e0cc1e87363be4bcc3a 100644 (file)
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -197,9 +197,6 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
        struct mirror_set *ms = m->ms;
        struct mirror *new;
 
-       if (!errors_handled(ms))
-               return;
-
        /*
         * error_count is used for nothing more than a
         * simple way to tell if a device has encountered
@@ -210,6 +207,9 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
        if (test_and_set_bit(error_type, &m->error_type))
                return;
 
+       if (!errors_handled(ms))
+               return;
+
        if (m != get_default_mirror(ms))
                goto out;
 
@@ -808,12 +808,6 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti,
        kfree(ms);
 }
 
-static inline int _check_region_size(struct dm_target *ti, uint32_t size)
-{
-       return !(size % (PAGE_SIZE >> 9) || !is_power_of_2(size) ||
-                size > ti->len);
-}
-
 static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                      unsigned int mirror, char **argv)
 {
@@ -872,12 +866,6 @@ static struct dm_dirty_log *create_dirty_log(struct dm_target *ti,
                return NULL;
        }
 
-       if (!_check_region_size(ti, dl->type->get_region_size(dl))) {
-               ti->error = "Invalid region size";
-               dm_dirty_log_destroy(dl);
-               return NULL;
-       }
-
        return dl;
 }
 
@@ -1300,11 +1288,7 @@ static int __init dm_mirror_init(void)
 
 static void __exit dm_mirror_exit(void)
 {
-       int r;
-
-       r = dm_unregister_target(&mirror_target);
-       if (r < 0)
-               DMERR("unregister failed %d", r);
+       dm_unregister_target(&mirror_target);
 }
 
 /* Module hooks */