[PATCH] remove __MOD_* from dm

From: Greg KH (greg@kroah.com)
Date: Fri Dec 20 2002 - 18:38:56 EST


Here's another patch against 2.5.52-bk that gets rid of the old __MOD_*
functions for the newer module api. This also allows the modules to be
unloaded.

Joe, please add this to your next round of patches.

thanks,

greg k-h

# DM: convert old __MOD_INC and __MOD_DEC calls to the new style.

diff -Nru a/drivers/md/dm-target.c b/drivers/md/dm-target.c
--- a/drivers/md/dm-target.c Fri Dec 20 15:38:41 2002
+++ b/drivers/md/dm-target.c Fri Dec 20 15:38:41 2002
@@ -46,10 +46,14 @@
         ti = __find_target_type(name);
 
         if (ti) {
- if (ti->use == 0 && ti->tt.module)
- __MOD_INC_USE_COUNT(ti->tt.module);
+ if (ti->use == 0)
+ if (!try_module_get(ti->tt.module)) {
+ ti = NULL;
+ goto exit;
+ }
                 ti->use++;
         }
+exit:
         read_unlock(&_lock);
 
         return ti;
@@ -86,8 +90,8 @@
         struct tt_internal *ti = (struct tt_internal *) t;
 
         read_lock(&_lock);
- if (--ti->use == 0 && ti->tt.module)
- __MOD_DEC_USE_COUNT(ti->tt.module);
+ if (--ti->use == 0)
+ module_put(ti->tt.module);
 
         if (ti->use < 0)
                 BUG();
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Dec 23 2002 - 22:00:28 EST