From 0d05dd8d03b0dc0307f085002235a9cf5b497f7a Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Mon, 22 Jun 2009 10:12:11 +0100
Subject: [PATCH] --- yaml --- r: 154233 b: refs/heads/master c:
 4d89b7b4e4726893453d0fb4ddbb5b3e16353994 h: refs/heads/master i:   154231:
 ccc33227b67091e6028df9c4824c2f68489c03b5 v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/dm.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4b5d8f94d45..739bbbaabe23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e094f4f15f5169526c7200b9bde44b900548a81e
+refs/heads/master: 4d89b7b4e4726893453d0fb4ddbb5b3e16353994
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index 48db308fae67..f1db689667ea 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -1777,6 +1777,10 @@ struct mapped_device *dm_get_from_kobject(struct kobject *kobj)
 	if (&md->kobj != kobj)
 		return NULL;
 
+	if (test_bit(DMF_FREEING, &md->flags) ||
+	    test_bit(DMF_DELETING, &md->flags))
+		return NULL;
+
 	dm_get(md);
 	return md;
 }