From 796a8681f917901e38ea8c213b698f24273a277d Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Tue, 2 Aug 2011 12:32:06 +0100
Subject: [PATCH] --- yaml --- r: 262207 b: refs/heads/master c:
 759dea204cce9f1fc2a5d00ea25211299fc7a4a0 h: refs/heads/master i:   262205:
 2c1e79ae9c55876bbe1a80abb6fdbedaf03755f7   262203:
 c2a2c77a8942e9ea2efc0c93093153a574315a14   262199:
 54a469245f0e3d6cc3d6df5bc4ed561ac2506501   262191:
 195994d23fe26437db047f2ef048b21dbc67f70e   262175:
 a86d352868714b74cc9cb49df36972f84d02027e   262143:
 10438bb1a705ac6f20e9ec7238d8999978d135f3 v: v3

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

diff --git a/[refs] b/[refs]
index 6e3e37b4233b..b57f07092eb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba2e19b0f4ccd6920fe175a86521ff18ede260cb
+refs/heads/master: 759dea204cce9f1fc2a5d00ea25211299fc7a4a0
diff --git a/trunk/drivers/md/dm-ioctl.c b/trunk/drivers/md/dm-ioctl.c
index 4c350914f4a0..2e9a3ca37bdd 100644
--- a/trunk/drivers/md/dm-ioctl.c
+++ b/trunk/drivers/md/dm-ioctl.c
@@ -739,10 +739,16 @@ static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
 	struct hash_cell *hc = NULL;
 
 	if (*param->uuid) {
+		if (*param->name || param->dev)
+			return NULL;
+
 		hc = __get_uuid_cell(param->uuid);
 		if (!hc)
 			return NULL;
 	} else if (*param->name) {
+		if (param->dev)
+			return NULL;
+
 		hc = __get_name_cell(param->name);
 		if (!hc)
 			return NULL;