Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d37d02 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Acked-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa72b903

drivers/block/ll_rw_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth) 
	if (!tag_index)

		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);

	if (!tag_map)

		goto fail;
@@ -880,7 +880,7 @@ int blk_queue_resize_tags(request_queue_t *q, int new_depth) 
		return -ENOMEM;



	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));



	kfree(tag_index);

include/linux/blkdev.h

+0 −3
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ enum blk_queue_state { 
	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 request **tag_index;	/* map of busy tags */

	unsigned long *tag_map;		/* bit map of free/busy tags */