Commit 5642b8a6 authored by Cheng Renquan's avatar Cheng Renquan Committed by Alasdair G Kergon

dm target: use module refcount directly

The tt_internal's 'use' field is superfluous: the module's refcount can do
the work properly.  An acceptable side-effect is that this increases the
reference counts reported by 'lsmod'.

Remove the superfluous test when removing a target module.

[Crash possible without this on SMP - agk]

Cc: stable@kernel.org
Signed-off-by: default avatarCheng Renquan <crquan@gmail.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Reviewed-by: default avatarAlasdair G Kergon <agk@redhat.com>
Reviewed-by: default avatarJonathan Brassow <jbrassow@redhat.com>
parent 35bf659b
...@@ -18,7 +18,6 @@ struct tt_internal { ...@@ -18,7 +18,6 @@ struct tt_internal {
struct target_type tt; struct target_type tt;
struct list_head list; struct list_head list;
long use;
}; };
static LIST_HEAD(_targets); static LIST_HEAD(_targets);
...@@ -44,12 +43,8 @@ static struct tt_internal *get_target_type(const char *name) ...@@ -44,12 +43,8 @@ static struct tt_internal *get_target_type(const char *name)
down_read(&_lock); down_read(&_lock);
ti = __find_target_type(name); ti = __find_target_type(name);
if (ti) { if (ti && !try_module_get(ti->tt.module))
if ((ti->use == 0) && !try_module_get(ti->tt.module)) ti = NULL;
ti = NULL;
else
ti->use++;
}
up_read(&_lock); up_read(&_lock);
return ti; return ti;
...@@ -77,10 +72,7 @@ void dm_put_target_type(struct target_type *t) ...@@ -77,10 +72,7 @@ void dm_put_target_type(struct target_type *t)
struct tt_internal *ti = (struct tt_internal *) t; struct tt_internal *ti = (struct tt_internal *) t;
down_read(&_lock); down_read(&_lock);
if (--ti->use == 0) module_put(ti->tt.module);
module_put(ti->tt.module);
BUG_ON(ti->use < 0);
up_read(&_lock); up_read(&_lock);
return; return;
...@@ -140,12 +132,6 @@ void dm_unregister_target(struct target_type *t) ...@@ -140,12 +132,6 @@ void dm_unregister_target(struct target_type *t)
BUG(); BUG();
} }
if (ti->use) {
DMCRIT("Attempt to unregister target still in use: %s",
t->name);
BUG();
}
list_del(&ti->list); list_del(&ti->list);
kfree(ti); kfree(ti);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment