[PATCH] remove __MOD_* from dm

[PATCH] remove __MOD_* from dm

[Greg KH]

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();

Re: [lvm-devel] [PATCH] remove __MOD_* from dm

[Joe Thornber]

On Fri, Dec 20, 2002 at 03:38:56PM -0800, Greg KH wrote:
> 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, if the following patchset has no problems I'll push it to
Linus at the end of the week.

http://people.sistina.com/~thornber/patches/2.5-stable/2.5.53/2.5.53-dm-2.tar.bz2

- Joe