From 6e6a8f26ce1395b35779fc0e607fc53a1e9fe2fe Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Sat, 6 Mar 2010 02:32:24 +0000
Subject: [PATCH] --- yaml --- r: 186430 b: refs/heads/master c:
 0f3649a9e305ea22eb196a84a2d7520afcaa6060 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-ioctl.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 73102b9c9fd3..ef2e05a7aba8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ede5ea0b8b815560dc54c712536fdf0b456b6ad0
+refs/heads/master: 0f3649a9e305ea22eb196a84a2d7520afcaa6060
diff --git a/trunk/drivers/md/dm-ioctl.c b/trunk/drivers/md/dm-ioctl.c
index 1d669322b27c..e3cf5686d0aa 100644
--- a/trunk/drivers/md/dm-ioctl.c
+++ b/trunk/drivers/md/dm-ioctl.c
@@ -897,16 +897,17 @@ static int do_resume(struct dm_ioctl *param)
 			set_disk_ro(dm_disk(md), 1);
 	}
 
-	if (dm_suspended_md(md))
+	if (dm_suspended_md(md)) {
 		r = dm_resume(md);
+		if (!r)
+			dm_kobject_uevent(md, KOBJ_CHANGE, param->event_nr);
+	}
 
 	if (old_map)
 		dm_table_destroy(old_map);
 
-	if (!r) {
-		dm_kobject_uevent(md, KOBJ_CHANGE, param->event_nr);
+	if (!r)
 		r = __dev_status(md, param);
-	}
 
 	dm_put(md);
 	return r;