forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
fa72b903f7
commit
f7d37d028d
@ -789,7 +789,7 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth)
|
|||||||
if (!tag_index)
|
if (!tag_index)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
nr_ulongs = ALIGN(depth, BLK_TAGS_PER_LONG) / BLK_TAGS_PER_LONG;
|
nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
|
||||||
tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
|
tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
|
||||||
if (!tag_map)
|
if (!tag_map)
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -880,7 +880,7 @@ int blk_queue_resize_tags(request_queue_t *q, int new_depth)
|
|||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
memcpy(bqt->tag_index, tag_index, max_depth * sizeof(struct request *));
|
memcpy(bqt->tag_index, tag_index, max_depth * sizeof(struct request *));
|
||||||
nr_ulongs = ALIGN(max_depth, BLK_TAGS_PER_LONG) / BLK_TAGS_PER_LONG;
|
nr_ulongs = ALIGN(max_depth, BITS_PER_LONG) / BITS_PER_LONG;
|
||||||
memcpy(bqt->tag_map, tag_map, nr_ulongs * sizeof(unsigned long));
|
memcpy(bqt->tag_map, tag_map, nr_ulongs * sizeof(unsigned long));
|
||||||
|
|
||||||
kfree(tag_index);
|
kfree(tag_index);
|
||||||
|
@ -285,9 +285,6 @@ enum blk_queue_state {
|
|||||||
Queue_up,
|
Queue_up,
|
||||||
};
|
};
|
||||||
|
|
||||||
#define BLK_TAGS_PER_LONG (sizeof(unsigned long) * 8)
|
|
||||||
#define BLK_TAGS_MASK (BLK_TAGS_PER_LONG - 1)
|
|
||||||
|
|
||||||
struct blk_queue_tag {
|
struct blk_queue_tag {
|
||||||
struct request **tag_index; /* map of busy tags */
|
struct request **tag_index; /* map of busy tags */
|
||||||
unsigned long *tag_map; /* bit map of free/busy tags */
|
unsigned long *tag_map; /* bit map of free/busy tags */
|
||||||
|
Loading…
Reference in New Issue
Block a user