shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-20 18:09:23 +03:00
Code Releases Activity

metadata-exported: forgot merge fixup

Browse Source
This commit is contained in:
Heinz Mauelshagen 2015-06-08 15:16:48 +02:00
parent 0111df15eb
commit 77159c77c5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/metadata/metadata-exported.h
View File

@ -119,7 +119,6 @@
#define CACHE UINT64_C(0x0001000000000000) /* LV - Internal use only */
#define LV_PENDING_DELETE UINT64_C(0x0004000000000000) /* LV - Internal use only */
<<<<<<< HEAD
#define LV_RESHAPE_DELTA_DISKS_PLUS UINT64_C(0x0008000000000000) /* LV reshape flag delta disks plus image(s) */
#define LV_RESHAPE_DELTA_DISKS_MINUS UINT64_C(0x0010000000000000) /* LV reshape flag delta disks minus image(s) */
@ -128,8 +127,6 @@
e.g. to prohibit allocation of a RAID image
on a PV already holing an image of the RAID set */
/* Next unused flag: UINT64_C(0x0040000000000000) */
=======
#define LV_REMOVED UINT64_C(0x0040000000000000) /* LV - Internal use only
This flag is used to mark an LV once it has
been removed from the VG. It might still
@ -139,12 +136,11 @@
FIXME: Remove this flag once we have indexed
vg->removed_lvs for quick lookup.
*/
#define LV_ERROR_WHEN_FULL UINT64_C(0x0008000000000000) /* LV - error when full */
#define LV_ERROR_WHEN_FULL UINT64_C(0x0008000000000000) /* LV - error when full */
#define PV_ALLOCATION_PROHIBITED UINT64_C(0x0010000000000000) /* PV - internal use only - allocation prohibited
e.g. to prohibit allocation of a RAID image
on a PV already holing an image of the RAID set */
/* Next unused flag: UINT64_C(0x0080000000000000) */
>>>>>>> master
/* Format features flags */
#define FMT_SEGMENTS 0x00000001U /* Arbitrary segment params? */