dm target: use module refcount directly

[~andy/linux] / drivers / md / dm-target.c

diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 835cf95b857fa6cbef32c0c6d0d474e03909221a..db72c9497bb4faf34ec9bfaf29c1de09f8d5a333 100644 (file)
--- a/drivers/md/dm-target.c
+++ b/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;
@@ -130,26 +122,20 @@ int dm_register_target(struct target_type *t)
        return rv;
 }
 
-int dm_unregister_target(struct target_type *t)
+void dm_unregister_target(struct target_type *t)
 {
        struct tt_internal *ti;
 
        down_write(&_lock);
        if (!(ti = __find_target_type(t->name))) {
-               up_write(&_lock);
-               return -EINVAL;
-       }
-
-       if (ti->use) {
-               up_write(&_lock);
-               return -ETXTBSY;
+               DMCRIT("Unregistering unrecognised target: %s", t->name);
+               BUG();
        }
 
        list_del(&ti->list);
        kfree(ti);
 
        up_write(&_lock);
-       return 0;
 }
 
 /*
@@ -187,8 +173,7 @@ int __init dm_target_init(void)
 
 void dm_target_exit(void)
 {
-       if (dm_unregister_target(&error_target))
-               DMWARN("error target unregistration failed");
+       dm_unregister_target(&error_target);
 }
 
 EXPORT_SYMBOL(dm_register_target);