diff options
author | Tejun Heo <htejun@gmail.com> | 2005-06-23 03:08:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:15 -0400 |
commit | f7d37d028dfba90b1b747f8ac685bf0959aeda8b (patch) | |
tree | 38627ec042c05f42feddff2ada95290ebe73679e /drivers/block | |
parent | fa72b903f75e4f0f0b2c2feed093005167da4023 (diff) |
[PATCH] blk: remove BLK_TAGS_{PER_LONG|MASK}
Replace BLK_TAGS_PER_LONG with BITS_PER_LONG and remove unused BLK_TAGS_MASK.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/ll_rw_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 896d17c28f42..99afeec1031f 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c | |||
@@ -789,7 +789,7 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth) | |||
789 | if (!tag_index) | 789 | if (!tag_index) |
790 | goto fail; | 790 | goto fail; |
791 | 791 | ||
792 | nr_ulongs = ALIGN(depth, BLK_TAGS_PER_LONG) / BLK_TAGS_PER_LONG; | 792 | nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG; |
793 | tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC); | 793 | tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC); |
794 | if (!tag_map) | 794 | if (!tag_map) |
795 | goto fail; | 795 | goto fail; |
@@ -880,7 +880,7 @@ int blk_queue_resize_tags(request_queue_t *q, int new_depth) | |||
880 | return -ENOMEM; | 880 | return -ENOMEM; |
881 | 881 | ||
882 | memcpy(bqt->tag_index, tag_index, max_depth * sizeof(struct request *)); | 882 | memcpy(bqt->tag_index, tag_index, max_depth * sizeof(struct request *)); |
883 | nr_ulongs = ALIGN(max_depth, BLK_TAGS_PER_LONG) / BLK_TAGS_PER_LONG; | 883 | nr_ulongs = ALIGN(max_depth, BITS_PER_LONG) / BITS_PER_LONG; |
884 | memcpy(bqt->tag_map, tag_map, nr_ulongs * sizeof(unsigned long)); | 884 | memcpy(bqt->tag_map, tag_map, nr_ulongs * sizeof(unsigned long)); |
885 | 885 | ||
886 | kfree(tag_index); | 886 | kfree(tag_index); |