Skip to contentSkip to conversation

dm target: use module refcount directly

PATCH In review Alasdair G Kergon 3 participants 3 messages Jan 7, 2009 – Jan 8, 2009 Device mapper

lore
Share & tools
lore

Alasdair G Kergon

author maintainer
#0 lore raw

PATCH 1/2 dm target: use module refcount directly

From: Cheng Renquan <[email protected]>

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.

---
 drivers/md/dm-target.c |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)
drivers/md/dm-target.c +3 -17
Index: linux-2.6.28/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_ty
 	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_ty
 	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_
 		BUG();
 	}
 
-	if (ti->use) {
-		DMCRIT("Attempt to unregister target still in use: %s",
-		       t->name);
-		BUG();
-	}
-
 	list_del(&ti->list);
 	kfree(ti);
 
#1 lore raw
Quoted 7 lines · Alasdair G Kergon

From: Cheng Renquan <[email protected]>

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.

Thank you for doing the work, I'm just too busy to have time to take it.

I've applied these two patches on the current linus's 2.6.29 kernel head, and have done some simple building and running tests, it seems OK with allyesconfig, allnoconfig(with all DM config enabled), and serverl randconfigs with DM enabled.

Quoted 11 lines
---
 drivers/md/dm-target.c |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

Index: linux-2.6.28/drivers/md/dm-target.c
===================================================================

drivers/md/dm-target.c 2009-01-07 20:30:57.000000000 +0000 renamed from drivers/md/dm-target.c 2009-01-07 20:29:57.000000000 +0000 +0 -0
Signature · 3 lines
Cheng Renquan (程任全), Shenzhen, China
Joan Crawford  - "I, Joan Crawford, I believe in the dollar.
Everything I earn, I spend."
Reviewed-by on v1 1/2
#2 lore raw
In reply to Alasdair G Kergon

brassow

Quoted 74 lines · Alasdair G Kergon

From: Cheng Renquan <[email protected]>

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.

---
drivers/md/dm-target.c | 20 +++-----------------

1 files changed, 3 insertions(+), 17 deletions(-)

Index: linux-2.6.28/drivers/md/dm-target.c
===================================================================
--- linux-2.6.28.orig/drivers/md/dm-target.c 2009-01-07
20:29:57.000000000 +0000
+++ linux-2.6.28/drivers/md/dm-target.c 2009-01-07
20:30:57.000000000 +0000

drivers/md/dm-target.c +3 -18
@@ -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_ty
 	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_ty
 	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_
 		BUG();
 	}
 
-	if (ti->use) {
-		DMCRIT("Attempt to unregister target still in use: %s",
-		       t->name);
-		BUG();
-	}
-
 	list_del(&ti->list);
 	kfree(ti);
 
 
--

dm-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/dm-devel