From 08bc6ae365438f3bba0f772268db64ecfbea5149 Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Sat, 6 Mar 2010 02:29:52 +0000
Subject: [PATCH] --- yaml --- r: 186423 b: refs/heads/master c:
 ecdb2e257abc33ae6798d3ccba87bdafa40ef6b6 h: refs/heads/master i:   186421:
 b6f392f57402dd8fd67585aef1a0f69cc53f5950   186419:
 33b54ec7eb1c7102b18f80ae4899bc8c7edd8c0e   186415:
 6c4a10d56b0e217b70eb50f35fe7ba60754be959 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/md/dm-table.c  |  2 --
 trunk/drivers/md/dm-uevent.c |  7 ++-----
 trunk/drivers/md/dm.c        | 14 ++------------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 6b1c1041a738..d229561156f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7b934c8127deebf4eb56fbe4a4ae0da16b6dbcd
+refs/heads/master: ecdb2e257abc33ae6798d3ccba87bdafa40ef6b6
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index 4b22feb01a0c..7d70cca585ac 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -1231,8 +1231,6 @@ void dm_table_unplug_all(struct dm_table *t)
 
 struct mapped_device *dm_table_get_md(struct dm_table *t)
 {
-	dm_get(t->md);
-
 	return t->md;
 }
 
diff --git a/trunk/drivers/md/dm-uevent.c b/trunk/drivers/md/dm-uevent.c
index c7c555a8c7b2..6b1e3b61b25e 100644
--- a/trunk/drivers/md/dm-uevent.c
+++ b/trunk/drivers/md/dm-uevent.c
@@ -187,7 +187,7 @@ void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,
 
 	if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) {
 		DMERR("%s: Invalid event_type %d", __func__, event_type);
-		goto out;
+		return;
 	}
 
 	event = dm_build_path_uevent(md, ti,
@@ -195,12 +195,9 @@ void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,
 				     _dm_uevent_type_names[event_type].name,
 				     path, nr_valid_paths);
 	if (IS_ERR(event))
-		goto out;
+		return;
 
 	dm_uevent_add(md, &event->elist);
-
-out:
-	dm_put(md);
 }
 EXPORT_SYMBOL_GPL(dm_path_uevent);
 
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index aa4e2aa86d49..21222f5193fb 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -2699,23 +2699,13 @@ int dm_suspended_md(struct mapped_device *md)
 
 int dm_suspended(struct dm_target *ti)
 {
-	struct mapped_device *md = dm_table_get_md(ti->table);
-	int r = dm_suspended_md(md);
-
-	dm_put(md);
-
-	return r;
+	return dm_suspended_md(dm_table_get_md(ti->table));
 }
 EXPORT_SYMBOL_GPL(dm_suspended);
 
 int dm_noflush_suspending(struct dm_target *ti)
 {
-	struct mapped_device *md = dm_table_get_md(ti->table);
-	int r = __noflush_suspending(md);
-
-	dm_put(md);
-
-	return r;
+	return __noflush_suspending(dm_table_get_md(ti->table));
 }
 EXPORT_SYMBOL_GPL(dm_noflush_suspending);