Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / md / raid5.c

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 81eaa22..4ce0d75 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3299,8 +3299,8 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx,
                 */
                set_bit(STRIPE_BITMAP_PENDING, &sh->state);
                spin_unlock_irq(&sh->stripe_lock);
-               bitmap_startwrite(conf->mddev->bitmap, sh->sector,
-                                 STRIPE_SECTORS, 0);
+               md_bitmap_startwrite(conf->mddev->bitmap, sh->sector,
+                                    STRIPE_SECTORS, 0);
                spin_lock_irq(&sh->stripe_lock);
                clear_bit(STRIPE_BITMAP_PENDING, &sh->state);
                if (!sh->batch_head) {
@@ -3390,8 +3390,8 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
                        bi = nextbi;
                }
                if (bitmap_end)
-                       bitmap_endwrite(conf->mddev->bitmap, sh->sector,
-                               STRIPE_SECTORS, 0, 0);
+                       md_bitmap_endwrite(conf->mddev->bitmap, sh->sector,
+                                          STRIPE_SECTORS, 0, 0);
                bitmap_end = 0;
                /* and fail all 'written' */
                bi = sh->dev[i].written;
@@ -3436,8 +3436,8 @@ handle_failed_stripe(struct r5conf *conf, struct stripe_head *sh,
                        }
                }
                if (bitmap_end)
-                       bitmap_endwrite(conf->mddev->bitmap, sh->sector,
-                                       STRIPE_SECTORS, 0, 0);
+                       md_bitmap_endwrite(conf->mddev->bitmap, sh->sector,
+                                          STRIPE_SECTORS, 0, 0);
                /* If we were in the middle of a write the parity block might
                 * still be locked - so just clear all R5_LOCKED flags
                 */
@@ -3777,10 +3777,10 @@ returnbi:
                                        bio_endio(wbi);
                                        wbi = wbi2;
                                }
-                               bitmap_endwrite(conf->mddev->bitmap, sh->sector,
-                                               STRIPE_SECTORS,
-                                        !test_bit(STRIPE_DEGRADED, &sh->state),
-                                               0);
+                               md_bitmap_endwrite(conf->mddev->bitmap, sh->sector,
+                                                  STRIPE_SECTORS,
+                                                  !test_bit(STRIPE_DEGRADED, &sh->state),
+                                                  0);
                                if (head_sh->batch_head) {
                                        sh = list_first_entry(&sh->batch_list,
                                                              struct stripe_head,
@@ -5543,10 +5543,10 @@ static void make_discard_request(struct mddev *mddev, struct bio *bi)
                        for (d = 0;
                             d < conf->raid_disks - conf->max_degraded;
                             d++)
-                               bitmap_startwrite(mddev->bitmap,
-                                                 sh->sector,
-                                                 STRIPE_SECTORS,
-                                                 0);
+                               md_bitmap_startwrite(mddev->bitmap,
+                                                    sh->sector,
+                                                    STRIPE_SECTORS,
+                                                    0);
                        sh->bm_seq = conf->seq_flush + 1;
                        set_bit(STRIPE_BIT_DELAY, &sh->state);
                }
@@ -6024,11 +6024,11 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n
                }
 
                if (mddev->curr_resync < max_sector) /* aborted */
-                       bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
-                                       &sync_blocks, 1);
+                       md_bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
+                                          &sync_blocks, 1);
                else /* completed sync */
                        conf->fullsync = 0;
-               bitmap_close_sync(mddev->bitmap);
+               md_bitmap_close_sync(mddev->bitmap);
 
                return 0;
        }
@@ -6057,7 +6057,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n
        }
        if (!test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) &&
            !conf->fullsync &&
-           !bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&
+           !md_bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&
            sync_blocks >= STRIPE_SECTORS) {
                /* we can skip this block, and probably more */
                sync_blocks /= STRIPE_SECTORS;
@@ -6065,7 +6065,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n
                return sync_blocks * STRIPE_SECTORS; /* keep things rounded to whole stripes */
        }
 
-       bitmap_cond_end_sync(mddev->bitmap, sector_nr, false);
+       md_bitmap_cond_end_sync(mddev->bitmap, sector_nr, false);
 
        sh = raid5_get_active_stripe(conf, sector_nr, 0, 1, 0);
        if (sh == NULL) {
@@ -6088,7 +6088,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n
        }
        rcu_read_unlock();
 
-       bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, still_degraded);
+       md_bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, still_degraded);
 
        set_bit(STRIPE_SYNC_REQUESTED, &sh->state);
        set_bit(STRIPE_HANDLE, &sh->state);
@@ -6289,7 +6289,7 @@ static void raid5d(struct md_thread *thread)
                        /* Now is a good time to flush some bitmap updates */
                        conf->seq_flush++;
                        spin_unlock_irq(&conf->device_lock);
-                       bitmap_unplug(mddev->bitmap);
+                       md_bitmap_unplug(mddev->bitmap);
                        spin_lock_irq(&conf->device_lock);
                        conf->seq_write = conf->seq_flush;
                        activate_bit_delay(conf, conf->temp_inactive_list);
@@ -7745,7 +7745,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors)
            mddev->array_sectors > newsize)
                return -EINVAL;
        if (mddev->bitmap) {
-               int ret = bitmap_resize(mddev->bitmap, sectors, 0, 0);
+               int ret = md_bitmap_resize(mddev->bitmap, sectors, 0, 0);
                if (ret)
                        return ret;
        }