From 2c35c9dd62ecef01cd04bd14e84772cb2ab9c8bf Mon Sep 17 00:00:00 2001 From: Cheng Renquan Date: Thu, 2 Apr 2009 19:55:27 +0100 Subject: [PATCH] --- yaml --- r: 140157 b: refs/heads/master c: 5642b8a61a15436231adf27b2b1bd96901b623dd h: refs/heads/master i: 140155: ed398d7de115bf31a42e6dc3dd0710837f04bd45 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-target.c | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 28af6d7a9bc6..8fc37a0aaee1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35bf659b008e83e725dcd30f542e38461dbb867c +refs/heads/master: 5642b8a61a15436231adf27b2b1bd96901b623dd diff --git a/trunk/drivers/md/dm-target.c b/trunk/drivers/md/dm-target.c index 7decf10006e4..db72c9497bb4 100644 --- a/trunk/drivers/md/dm-target.c +++ b/trunk/drivers/md/dm-target.c @@ -18,7 +18,6 @@ struct tt_internal { struct target_type tt; struct list_head list; - long use; }; static LIST_HEAD(_targets); @@ -44,12 +43,8 @@ static struct tt_internal *get_target_type(const char *name) down_read(&_lock); ti = __find_target_type(name); - if (ti) { - if ((ti->use == 0) && !try_module_get(ti->tt.module)) - ti = NULL; - else - ti->use++; - } + if (ti && !try_module_get(ti->tt.module)) + ti = NULL; up_read(&_lock); return ti; @@ -77,10 +72,7 @@ void dm_put_target_type(struct target_type *t) struct tt_internal *ti = (struct tt_internal *) t; down_read(&_lock); - if (--ti->use == 0) - module_put(ti->tt.module); - - BUG_ON(ti->use < 0); + module_put(ti->tt.module); up_read(&_lock); return; @@ -140,12 +132,6 @@ void dm_unregister_target(struct target_type *t) BUG(); } - if (ti->use) { - DMCRIT("Attempt to unregister target still in use: %s", - t->name); - BUG(); - } - list_del(&ti->list); kfree(ti);