From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30116 invoked by alias); 25 Oct 2010 11:44:22 -0000 Received: (qmail 30099 invoked by uid 9447); 25 Oct 2010 11:44:21 -0000 Date: Mon, 25 Oct 2010 11:44:00 -0000 Message-ID: <20101025114421.30097.qmail@sourceware.org> From: agk@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/libdm ioctl/libdm-iface.c misc/dm-ioctl.h Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-10/txt/msg00063.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2010-10-25 11:44:21 Modified files: libdm/ioctl : libdm-iface.c libdm/misc : dm-ioctl.h Log message: Use a more-generic name for the new kernel flag so list_devices can share it. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.82&r2=1.83 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/misc/dm-ioctl.h.diff?cvsroot=lvm2&r1=1.6&r2=1.7 --- LVM2/libdm/ioctl/libdm-iface.c 2010/10/15 01:10:28 1.82 +++ LVM2/libdm/ioctl/libdm-iface.c 2010/10/25 11:44:20 1.83 @@ -1542,7 +1542,7 @@ "kernel. Aborting operation."); goto bad; } - dmi->flags |= DM_NEW_UUID_FLAG; + dmi->flags |= DM_UUID_FLAG; } dmi->target_count = count; --- LVM2/libdm/misc/dm-ioctl.h 2010/10/15 01:10:28 1.6 +++ LVM2/libdm/misc/dm-ioctl.h 2010/10/25 11:44:21 1.7 @@ -328,6 +328,6 @@ * 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 */