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

Commit 1c1133e1 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

bsg: device hash table cleanup 



- kill unused bsg_list_idx macro.
- add bsg_dev_idx_hash() that returns an appropriate hlist_head.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9b9f770c

block/bsg.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ static DEFINE_MUTEX(bsg_mutex); 
static int bsg_device_nr, bsg_minor_idx;

static int bsg_device_nr, bsg_minor_idx;





#define BSG_LIST_ARRAY_SIZE	8

#define BSG_LIST_ARRAY_SIZE	8

#define bsg_list_idx(minor)	((minor) & (BSG_LIST_ARRAY_SIZE - 1))

static struct hlist_head bsg_device_list[BSG_LIST_ARRAY_SIZE];

static struct hlist_head bsg_device_list[BSG_LIST_ARRAY_SIZE];





static struct class *bsg_class;

static struct class *bsg_class;
@@ -139,9 +138,9 @@ out: 
	return bc;

	return bc;

}

}





static inline void

static inline struct hlist_head *bsg_dev_idx_hash(int index)

bsg_add_done_cmd(struct bsg_device *bd, struct bsg_command *bc)

{

{

	return &bsg_device_list[index & (BSG_LIST_ARRAY_SIZE - 1)];

}

}





static int bsg_io_schedule(struct bsg_device *bd)

static int bsg_io_schedule(struct bsg_device *bd)
@@ -748,8 +747,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 
	atomic_set(&bd->ref_count, 1);

	atomic_set(&bd->ref_count, 1);

	bd->minor = iminor(inode);

	bd->minor = iminor(inode);

	mutex_lock(&bsg_mutex);

	mutex_lock(&bsg_mutex);

	hlist_add_head(&bd->dev_list,

	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(bd->minor));

		&bsg_device_list[bd->minor & (BSG_LIST_ARRAY_SIZE - 1)]);





	strncpy(bd->name, rq->bsg_dev.class_dev->class_id, sizeof(bd->name) - 1);

	strncpy(bd->name, rq->bsg_dev.class_dev->class_id, sizeof(bd->name) - 1);

	dprintk("bound to <%s>, max queue %d\n",

	dprintk("bound to <%s>, max queue %d\n",
@@ -761,14 +759,12 @@ static struct bsg_device *bsg_add_device(struct inode *inode, 




static struct bsg_device *__bsg_get_device(int minor)

static struct bsg_device *__bsg_get_device(int minor)

{

{

	struct hlist_head *list;

	struct bsg_device *bd = NULL;

	struct bsg_device *bd = NULL;

	struct hlist_node *entry;

	struct hlist_node *entry;





	mutex_lock(&bsg_mutex);

	mutex_lock(&bsg_mutex);





	list = &bsg_device_list[minor & (BSG_LIST_ARRAY_SIZE - 1)];

	hlist_for_each(entry, bsg_dev_idx_hash(minor)) {

	hlist_for_each(entry, list) {

		bd = hlist_entry(entry, struct bsg_device, dev_list);

		bd = hlist_entry(entry, struct bsg_device, dev_list);

		if (bd->minor == minor) {

		if (bd->minor == minor) {

			atomic_inc(&bd->ref_count);

			atomic_inc(&bd->ref_count);