From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 25 Oct 2010 11:44:20 +0000 (+0000)
Subject: Use a more-generic name for the new kernel flag so list_devices can share it.
X-Git-Tag: old-v2_02_75~18
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=45f69c7d5feeb71b9bde0ac8239c7039d2d8b396;p=lvm2.git

Use a more-generic name for the new kernel flag so list_devices can share it.
---

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 49b82e680..8c0115a90 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -1542,7 +1542,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
 				  "kernel.  Aborting operation.");
 			goto bad;
 		}
-		dmi->flags |= DM_NEW_UUID_FLAG;
+		dmi->flags |= DM_UUID_FLAG;
 	}
 
 	dmi->target_count = count;
diff --git a/libdm/misc/dm-ioctl.h b/libdm/misc/dm-ioctl.h
index f21272b05..fb11b5c7b 100644
--- a/libdm/misc/dm-ioctl.h
+++ b/libdm/misc/dm-ioctl.h
@@ -328,6 +328,6 @@ enum {
  * If set, rename changes the uuid not the name.  Only permitted
  * if no uuid was previously supplied: an existing uuid cannot be changed.
  */
-#define DM_NEW_UUID_FLAG        (1 << 14) /* In */
+#define DM_UUID_FLAG			(1 << 14) /* In */
 
 #endif				/* _LINUX_DM_IOCTL_H */