From 8654bf2ec49d90c46868ff5761fd4d16ac59dd48 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Mon, 31 Mar 2008 10:03:40 +0900 Subject: [PATCH] --- yaml --- r: 89777 b: refs/heads/master c: 43ac9e62c4a0a47fe3de1f1eb9ca7b8c91dce234 h: refs/heads/master i: 89775: c2052063da79ccfae6155324c6951599459f84d6 v: v3 --- [refs] | 2 +- trunk/block/bsg.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8850cc81b78f..e7421a5aab71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3ff1b90d8924dd1c55c3b56a79bfc563ace4a42 +refs/heads/master: 43ac9e62c4a0a47fe3de1f1eb9ca7b8c91dce234 diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c index e2c65a150a79..b413318a7c5d 100644 --- a/trunk/block/bsg.c +++ b/trunk/block/bsg.c @@ -368,7 +368,7 @@ static struct bsg_command *bsg_next_done_cmd(struct bsg_device *bd) spin_lock_irq(&bd->lock); if (bd->done_cmds) { - bc = list_entry(bd->done_list.next, struct bsg_command, list); + bc = list_first_entry(&bd->done_list, struct bsg_command, list); list_del(&bc->list); bd->done_cmds--; } @@ -772,21 +772,19 @@ static struct bsg_device *bsg_add_device(struct inode *inode, static struct bsg_device *__bsg_get_device(int minor) { - struct bsg_device *bd = NULL; + struct bsg_device *bd; struct hlist_node *entry; mutex_lock(&bsg_mutex); - hlist_for_each(entry, bsg_dev_idx_hash(minor)) { - bd = hlist_entry(entry, struct bsg_device, dev_list); + hlist_for_each_entry(bd, entry, bsg_dev_idx_hash(minor), dev_list) { if (bd->minor == minor) { atomic_inc(&bd->ref_count); - break; + goto found; } - - bd = NULL; } - + bd = NULL; +found: mutex_unlock(&bsg_mutex); return bd; }