blk-mq: move the cache friendly bitmap type of out blk-mq-tag

[linux-2.6-block.git] / block / blk-mq-tag.c

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 8d526a3e02f6b951e9bf6ee729ff5225579db28a..03ce6a11ba791de1002ac79b72a3ce7eac12a8b7 100644 (file)
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -21,7 +21,7 @@ static bool bt_has_free_tags(struct blk_mq_bitmap_tags *bt)
        int i;
 
        for (i = 0; i < bt->map_nr; i++) {
-               struct blk_mq_bitmap *bm = &bt->map[i];
+               struct blk_align_bitmap *bm = &bt->map[i];
                int ret;
 
                ret = find_first_zero_bit(&bm->word, bm->depth);
@@ -40,7 +40,7 @@ bool blk_mq_has_free_tags(struct blk_mq_tags *tags)
        return bt_has_free_tags(&tags->bitmap_tags);
 }
 
-static int __bt_get_word(struct blk_mq_bitmap *bm, unsigned int last_tag)
+static int __bt_get_word(struct blk_align_bitmap *bm, unsigned int last_tag)
 {
        int tag, org_last_tag, end;
 
@@ -283,7 +283,7 @@ static void bt_for_each_free(struct blk_mq_bitmap_tags *bt,
        int i;
 
        for (i = 0; i < bt->map_nr; i++) {
-               struct blk_mq_bitmap *bm = &bt->map[i];
+               struct blk_align_bitmap *bm = &bt->map[i];
                int bit = 0;
 
                do {
@@ -323,7 +323,7 @@ static unsigned int bt_unused_tags(struct blk_mq_bitmap_tags *bt)
        unsigned int i, used;
 
        for (i = 0, used = 0; i < bt->map_nr; i++) {
-               struct blk_mq_bitmap *bm = &bt->map[i];
+               struct blk_align_bitmap *bm = &bt->map[i];
 
                used += bitmap_weight(&bm->word, bm->depth);
        }
@@ -361,7 +361,7 @@ static int bt_alloc(struct blk_mq_bitmap_tags *bt, unsigned int depth,
                }
 
                nr = ALIGN(depth, tags_per_word) / tags_per_word;
-               bt->map = kzalloc_node(nr * sizeof(struct blk_mq_bitmap),
+               bt->map = kzalloc_node(nr * sizeof(struct blk_align_bitmap),
                                                GFP_KERNEL, node);
                if (!bt->map)
                        return -ENOMEM;