From c913a2f4863525309688bdaf07ebc23e12df2bab Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 29 May 2008 07:56:55 +0900 Subject: [PATCH] --- yaml --- r: 101536 b: refs/heads/master c: 3f27e3ed11e67c5ee19d560a50eafd93cf8c6682 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/bsg.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b57acf1f244..7bbefa9b043d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30e9ba9f2001f45960507f1963551311a67d0209 +refs/heads/master: 3f27e3ed11e67c5ee19d560a50eafd93cf8c6682 diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c index f0b7cd343216..7cdec32205d8 100644 --- a/trunk/block/bsg.c +++ b/trunk/block/bsg.c @@ -724,8 +724,13 @@ static int bsg_put_device(struct bsg_device *bd) mutex_lock(&bsg_mutex); do_free = atomic_dec_and_test(&bd->ref_count); - if (!do_free) + if (!do_free) { + mutex_unlock(&bsg_mutex); goto out; + } + + hlist_del(&bd->dev_list); + mutex_unlock(&bsg_mutex); dprintk("%s: tearing down\n", bd->name); @@ -741,10 +746,8 @@ static int bsg_put_device(struct bsg_device *bd) */ ret = bsg_complete_all_commands(bd); - hlist_del(&bd->dev_list); kfree(bd); out: - mutex_unlock(&bsg_mutex); kref_put(&q->bsg_dev.ref, bsg_kref_release_function); if (do_free) blk_put_queue(q);