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 49b82e680b159d99be2dc773f5122d5500b1b0f1..8c0115a900f7043d2d2ca16198f25a53bda7c3f3 100644 (file)
--- 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 f21272b059a93bea3d435fd44361d1b820b04739..fb11b5c7b54a5564b68ad09b8d96482b54e0701d 100644 (file)
--- 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 */