summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WHATS_NEW1
-rw-r--r--doc/example.conf14
-rw-r--r--lib/format1/format1.c1
-rw-r--r--lib/format_pool/format_pool.c1
-rw-r--r--lib/format_text/archiver.c2
-rw-r--r--lib/format_text/format-text.c48
-rw-r--r--lib/format_text/text_label.c6
-rw-r--r--lib/metadata/metadata-exported.h1
-rw-r--r--lib/metadata/metadata.c29
-rw-r--r--lib/metadata/metadata.h4
-rw-r--r--man/lvm.conf.5.in18
-rw-r--r--man/pvcreate.8.in10
-rwxr-xr-xtest/t-pvcreate-usage.sh54
-rw-r--r--tools/args.h1
-rw-r--r--tools/commands.h7
-rw-r--r--tools/pvcreate.c30
-rw-r--r--tools/vgconvert.c2
17 files changed, 190 insertions, 39 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 1085c29d..82e77147 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.45 -
===================================
+ Add --dataalignment to pvcreate to specify alignment of data area.
Exclude LCK_CACHE locks from _vg_lock_count, fixing interrupt unblocking.
Provide da and mda locations in debug message when writing text format label.
Mention the restriction on file descriptors at invocation on the lvm man page.
diff --git a/doc/example.conf b/doc/example.conf
index 16cefb2f..e06a3290 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -86,7 +86,7 @@ devices {
# If sysfs is mounted (2.6 kernels) restrict device scanning to
# the block devices it believes are valid.
# 1 enables; 0 disables.
- sysfs_scan = 1
+ sysfs_scan = 1
# By default, LVM2 will ignore devices used as components of
# software RAID (md) devices by looking for md superblocks.
@@ -98,6 +98,12 @@ devices {
# 1 enables; 0 disables.
md_chunk_alignment = 1
+ # Alignment (in KB) of start of data area when creating a new PV.
+ # If a PV is placed directly upon an md device and md_chunk_alignment is
+ # enabled this parameter is ignored.
+ # Set to 0 for the default alignment of 64KB or page size, if larger.
+ data_alignment = 0
+
# If, while scanning the system for PVs, LVM2 encounters a device-mapper
# device that has its I/O suspended, it waits for it to become accessible.
# Set this to 1 to skip such devices. This should only be needed
@@ -129,7 +135,7 @@ log {
# There are 6 syslog-like log levels currently in use - 2 to 7 inclusive.
# 7 is the most verbose (LOG_DEBUG).
level = 0
-
+
# Format of output messages
# Whether or not (1 or 0) to indent messages according to their severity
indent = 1
@@ -175,7 +181,7 @@ backup {
# Where should archived files go ?
# Remember to back up this directory regularly!
archive_dir = "/etc/lvm/archive"
-
+
# What is the minimum number of archive files you wish to keep ?
retain_min = 10
@@ -193,7 +199,7 @@ shell {
# Miscellaneous global LVM2 settings
global {
-
+
# The file creation mask for any files and directories created.
# Interpreted as octal if the first digit is zero.
umask = 077
diff --git a/lib/format1/format1.c b/lib/format1/format1.c
index 8ab9363a..01892e15 100644
--- a/lib/format1/format1.c
+++ b/lib/format1/format1.c
@@ -292,6 +292,7 @@ static int _format1_pv_read(const struct format_type *fmt, const char *pv_name,
static int _format1_pv_setup(const struct format_type *fmt,
uint64_t pe_start, uint32_t extent_count,
uint32_t extent_size,
+ unsigned long data_alignment __attribute((unused)),
int pvmetadatacopies __attribute((unused)),
uint64_t pvmetadatasize __attribute((unused)), struct dm_list *mdas __attribute((unused)),
struct physical_volume *pv, struct volume_group *vg __attribute((unused)))
diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c
index 0f72bd3b..ba89d961 100644
--- a/lib/format_pool/format_pool.c
+++ b/lib/format_pool/format_pool.c
@@ -191,6 +191,7 @@ static int _pool_pv_setup(const struct format_type *fmt __attribute((unused)),
uint64_t pe_start __attribute((unused)),
uint32_t extent_count __attribute((unused)),
uint32_t extent_size __attribute((unused)),
+ unsigned long data_alignment __attribute((unused)),
int pvmetadatacopies __attribute((unused)),
uint64_t pvmetadatasize __attribute((unused)),
struct dm_list *mdas __attribute((unused)),
diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index 9234e2e8..0406ae50 100644
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -307,7 +307,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg)
return 0;
}
if (!vg->fid->fmt->ops->
- pv_setup(vg->fid->fmt, UINT64_C(0), 0, 0, 0,
+ pv_setup(vg->fid->fmt, UINT64_C(0), 0, 0, 0, 0UL,
UINT64_C(0), &vg->fid->metadata_areas, pv, vg)) {
log_error("Format-specific setup for %s failed",
pv_dev_name(pv));
diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 428b5e25..d6032dc5 100644
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <sys/file.h>
+#include <sys/param.h>
#include <limits.h>
#include <dirent.h>
#include <ctype.h>
@@ -1182,7 +1183,7 @@ static int _mda_setup(const struct format_type *fmt,
if (!pvmetadatacopies)
return 1;
- alignment = pe_align(pv) << SECTOR_SHIFT;
+ alignment = pv->pe_align << SECTOR_SHIFT;
disk_size = pv->size << SECTOR_SHIFT;
pe_start <<= SECTOR_SHIFT;
pe_end <<= SECTOR_SHIFT;
@@ -1296,6 +1297,7 @@ static int _mda_setup(const struct format_type *fmt,
/* Only for orphans */
/* Set label_sector to -1 if rewriting existing label into same sector */
+/* If mdas is supplied it overwrites existing mdas e.g. used with pvcreate */
static int _text_pv_write(const struct format_type *fmt, struct physical_volume *pv,
struct dm_list *mdas, int64_t label_sector)
{
@@ -1306,6 +1308,7 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume
char buf[MDA_HEADER_SIZE] __attribute((aligned(8)));
struct mda_header *mdah = (struct mda_header *) buf;
uint64_t adjustment;
+ struct data_area_list *da;
/* FIXME Test mode don't update cache? */
@@ -1342,14 +1345,24 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume
dm_list_init(&info->mdas);
}
- if (info->das.n)
+ /*
+ * If no pe_start supplied but PV already exists,
+ * preserve existing value.
+ */
+ if (info->das.n) {
+ if (!pv->pe_start)
+ dm_list_iterate_items(da, &info->das)
+ pv->pe_start = da->disk_locn.offset >> SECTOR_SHIFT;
del_das(&info->das);
- else
+ } else
dm_list_init(&info->das);
- /* Set pe_start to first aligned sector after any metadata
- * areas that begin before pe_start */
- pv->pe_start = pe_align(pv);
+ /*
+ * If pe_start is still unset, set it to first aligned
+ * sector after any metadata areas that begin before pe_start.
+ */
+ if (!pv->pe_start)
+ pv->pe_start = pv->pe_align;
dm_list_iterate_items(mda, &info->mdas) {
mdac = (struct mda_context *) mda->metadata_locn;
if (pv->dev == mdac->area.dev &&
@@ -1358,9 +1371,9 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume
(pv->pe_start << SECTOR_SHIFT))) {
pv->pe_start = (mdac->area.start + mdac->area.size)
>> SECTOR_SHIFT;
- adjustment = pv->pe_start % pe_align(pv);
+ adjustment = pv->pe_start % pv->pe_align;
if (adjustment)
- pv->pe_start += (pe_align(pv) - adjustment);
+ pv->pe_start += pv->pe_align - adjustment;
}
}
if (!add_da
@@ -1574,7 +1587,7 @@ static struct metadata_area_ops _metadata_text_raw_ops = {
/* pvmetadatasize in sectors */
static int _text_pv_setup(const struct format_type *fmt,
uint64_t pe_start, uint32_t extent_count,
- uint32_t extent_size,
+ uint32_t extent_size, unsigned long data_alignment,
int pvmetadatacopies,
uint64_t pvmetadatasize, struct dm_list *mdas,
struct physical_volume *pv, struct volume_group *vg)
@@ -1665,6 +1678,23 @@ static int _text_pv_setup(const struct format_type *fmt,
/* FIXME Default from config file? vgextend cmdline flag? */
pv->status |= ALLOCATABLE_PV;
} else {
+ if (pe_start)
+ pv->pe_start = pe_start;
+
+ if (!data_alignment)
+ data_alignment = find_config_tree_int(pv->fmt->cmd,
+ "devices/data_alignment",
+ 0) * 2;
+
+ if (set_pe_align(pv, data_alignment) != data_alignment &&
+ data_alignment)
+ log_warn("WARNING: %s: Overriding data alignment to "
+ "%lu sectors (requested %lu sectors)",
+ pv_dev_name(pv), pv->pe_align, data_alignment);
+
+ if (pv->pe_start < pv->pe_align)
+ pv->pe_start = pv->pe_align;
+
if (extent_count)
pe_end = pe_start + extent_count * extent_size - 1;
if (!_mda_setup(fmt, pe_start, pe_end, pvmetadatacopies,
diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c
index cc5b78a0..110bc1d6 100644
--- a/lib/format_text/text_label.c
+++ b/lib/format_text/text_label.c
@@ -136,6 +136,12 @@ static int _text_write(struct label *label, void *buf)
mda2 ? xlate64(pvhdr->disk_areas_xl[mda2].size) >> SECTOR_SHIFT : 0,
mda2 ? "s)" : "");
+ if (da1 < 0) {
+ log_error("Internal error: %s label header currently requires "
+ "a data area.", dev_name(info->dev));
+ return 0;
+ }
+
return 1;
}
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index a1c45cef..c14213e0 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -407,6 +407,7 @@ pv_t *pv_create(const struct cmd_context *cmd,
struct device *dev,
struct id *id,
uint64_t size,
+ unsigned long data_alignment,
uint64_t pe_start,
uint32_t existing_extent_count,
uint32_t existing_extent_size,
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index a2b5f2f6..146b6ac2 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -46,6 +46,7 @@ static struct physical_volume *_pv_read(struct cmd_context *cmd,
static struct physical_volume *_pv_create(const struct format_type *fmt,
struct device *dev,
struct id *id, uint64_t size,
+ unsigned long data_alignment,
uint64_t pe_start,
uint32_t existing_extent_count,
uint32_t existing_extent_size,
@@ -65,19 +66,22 @@ static struct pv_list *_find_pv_in_vg(const struct volume_group *vg,
static struct physical_volume *_find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id);
-unsigned long pe_align(struct physical_volume *pv)
+unsigned long set_pe_align(struct physical_volume *pv, unsigned long data_alignment)
{
if (pv->pe_align)
goto out;
- pv->pe_align = MAX(65536UL, lvm_getpagesize()) >> SECTOR_SHIFT;
+ if (data_alignment)
+ pv->pe_align = data_alignment;
+ else
+ pv->pe_align = MAX(65536UL, lvm_getpagesize()) >> SECTOR_SHIFT;
- /*
- * Align to chunk size of underlying md device if present
- */
if (!pv->dev)
goto out;
+ /*
+ * Align to chunk size of underlying md device if present
+ */
if (find_config_tree_bool(pv->fmt->cmd, "devices/md_chunk_alignment",
DEFAULT_MD_CHUNK_ALIGNMENT))
pv->pe_align = MAX(pv->pe_align,
@@ -146,18 +150,13 @@ int add_pv_to_vg(struct volume_group *vg, const char *pv_name,
/* Units of 512-byte sectors */
pv->pe_size = vg->extent_size;
- /* FIXME Do proper rounding-up alignment? */
- /* Reserved space for label; this holds 0 for PVs created by LVM1 */
- if (pv->pe_start < pe_align(pv))
- pv->pe_start = pe_align(pv);
-
/*
* pe_count must always be calculated by pv_setup
*/
pv->pe_alloc_count = 0;
if (!fid->fmt->ops->pv_setup(fid->fmt, UINT64_C(0), 0,
- vg->extent_size, 0, UINT64_C(0),
+ vg->extent_size, 0, 0UL, UINT64_C(0),
&fid->metadata_areas, pv, vg)) {
log_error("Format-specific setup of physical volume '%s' "
"failed.", pv_name);
@@ -759,6 +758,7 @@ int vg_split_mdas(struct cmd_context *cmd __attribute((unused)),
* @dev: PV device to initialize
* @id: PV UUID to use for initialization
* @size: size of the PV in sectors
+ * @data_alignment: requested alignment of data
* @pe_start: physical extent start
* @existing_extent_count
* @existing_extent_size
@@ -776,13 +776,14 @@ int vg_split_mdas(struct cmd_context *cmd __attribute((unused)),
pv_t *pv_create(const struct cmd_context *cmd,
struct device *dev,
struct id *id, uint64_t size,
+ unsigned long data_alignment,
uint64_t pe_start,
uint32_t existing_extent_count,
uint32_t existing_extent_size,
int pvmetadatacopies,
uint64_t pvmetadatasize, struct dm_list *mdas)
{
- return _pv_create(cmd->fmt, dev, id, size, pe_start,
+ return _pv_create(cmd->fmt, dev, id, size, data_alignment, pe_start,
existing_extent_count,
existing_extent_size,
pvmetadatacopies,
@@ -826,6 +827,7 @@ static struct physical_volume *_alloc_pv(struct dm_pool *mem, struct device *dev
static struct physical_volume *_pv_create(const struct format_type *fmt,
struct device *dev,
struct id *id, uint64_t size,
+ unsigned long data_alignment,
uint64_t pe_start,
uint32_t existing_extent_count,
uint32_t existing_extent_size,
@@ -870,13 +872,14 @@ static struct physical_volume *_pv_create(const struct format_type *fmt,
pv->vg_name = fmt->orphan_vg_name;
if (!fmt->ops->pv_setup(fmt, pe_start, existing_extent_count,
- existing_extent_size,
+ existing_extent_size, data_alignment,
pvmetadatacopies, pvmetadatasize, mdas,
pv, NULL)) {
log_error("%s: Format-specific setup of physical volume "
"failed.", pv_dev_name(pv));
goto bad;
}
+
return pv;
bad:
diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index c425fbfe..855ff822 100644
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -209,7 +209,7 @@ struct format_handler {
*/
int (*pv_setup) (const struct format_type * fmt,
uint64_t pe_start, uint32_t extent_count,
- uint32_t extent_size,
+ uint32_t extent_size, unsigned long data_alignment,
int pvmetadatacopies,
uint64_t pvmetadatasize, struct dm_list * mdas,
struct physical_volume * pv, struct volume_group * vg);
@@ -263,7 +263,7 @@ struct format_handler {
/*
* Utility functions
*/
-unsigned long pe_align(struct physical_volume *pv);
+unsigned long set_pe_align(struct physical_volume *pv, unsigned long data_alignment);
int vg_validate(struct volume_group *vg);
int pv_write_orphan(struct cmd_context *cmd, struct physical_volume *pv);
diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in
index fdd728a9..68024b65 100644
--- a/man/lvm.conf.5.in
+++ b/man/lvm.conf.5.in
@@ -124,14 +124,28 @@ you'll need \fBtypes = ["device-mapper", 16]\fP. But if you do this,
be careful to avoid recursion within LVM2. The figure for number
of partitions is not currently used in LVM2 - and might never be.
.IP
-\fBsysfs_scan\fP (em If set to 1 and your kernel supports sysfs and
+\fBsysfs_scan\fP \(em If set to 1 and your kernel supports sysfs and
it is mounted, sysfs will be used as a quick way of filtering out
block devices that are not present.
.IP
-\fBmd_component_detection\fP (em If set to 1, LVM2 will ignore devices
+\fBmd_component_detection\fP \(em If set to 1, LVM2 will ignore devices
used as components of software RAID (md) devices by looking for md
superblocks. This doesn't always work satisfactorily e.g. if a device
has been reused without wiping the md superblocks first.
+.IP
+\fBmd_chunk_alignment\fP \(em If set to 1, and a Physical Volume is placed
+directly upon an md device, LVM2 will align its data blocks with the the
+chunk_size exposed in sysfs.
+.IP
+\fBdata_alignment\fP \(em Default alignment (in KB) of start of data area
+when creating a new Physical Volume using the \fBlvm2\fP format.
+If a Physical Volume is placed directly upon an md device and
+\fBmd_chunk_alignment\fP is enabled this parameter is ignored.
+Set to 0 to use the default alignment of 64KB or the page size, if larger.
+.sp
+To see the location of the first Physical Extent of an existing Physical Volume
+use \fBpvs -o +pe_start\fP . It will be a multiple of the requested
+\fBdata_alignment\fP.
.TP
\fBlog\fP \(em Default log settings
.IP
diff --git a/man/pvcreate.8.in b/man/pvcreate.8.in
index 7ecda565..4d488058 100644
--- a/man/pvcreate.8.in
+++ b/man/pvcreate.8.in
@@ -13,6 +13,7 @@ pvcreate \- initialize a disk or partition for use by LVM
.RB [ \-M | \-\-metadatatype type ]
.RB [ \-\-metadatacopies #copies ]
.RB [ \-\-metadatasize size ]
+.RB [ \-\-dataalignment alignment ]
.RB [ \-\-restorefile file ]
.RB [ \-\-setphysicalvolumesize size ]
.RB [ \-u | \-\-uuid uuid ]
@@ -89,6 +90,15 @@ to see where the metadata areas are placed.
The approximate amount of space to be set aside for each metadata area.
(The size you specify may get rounded.)
.TP
+.BR \-\-dataalignment " alignment"
+Align the offset of the start of the data to a multiple of this number.
+You should also specify an appropriate \fBPhysicalExtentSize\fP when creating
+the Volume Group with \fBvgcreate\fP.
+.sp
+To see the location of the first Physical Extent of an existing Physical Volume
+use \fBpvs -o +pe_start\fP . It will be a multiple of the requested
+\fBdata_alignment\fP.
+.TP
.BR \-\-metadatacopies " copies"
The number of metadata areas to set aside on each PV. Currently
this can be 0, 1 or 2.
diff --git a/test/t-pvcreate-usage.sh b/test/t-pvcreate-usage.sh
index c46181f6..c4f64b07 100755
--- a/test/t-pvcreate-usage.sh
+++ b/test/t-pvcreate-usage.sh
@@ -70,3 +70,57 @@ not pvcreate --labelsector 1000000000000 $dev1
# x. BLKGETSIZE64 fails
# x. set size to value inconsistent with device / PE size
+#COMM 'pvcreate basic dataalignment sanity checks'
+not pvcreate --dataalignment -1 $dev1
+not pvcreate -M 1 --dataalignment 1 $dev1
+not pvcreate --dataalignment 1E $dev1
+
+#COMM 'pvcreate always rounded up to page size for start of device'
+pvcreate --metadatacopies 0 --dataalignment 1 $dev1
+# amuse shell experts
+check_pv_field_ $dev1 pe_start $(($(getconf PAGESIZE)/1024))".00K"
+
+#COMM 'pvcreate sets data offset directly'
+pvcreate --dataalignment 512k $dev1
+check_pv_field_ $dev1 pe_start 512.00K
+
+#COMM 'vgcreate/vgremove do not modify data offset of existing PV'
+vgcreate $vg $dev1 --config 'devices { data_alignment = 1024 }'
+check_pv_field_ $dev1 pe_start 512.00K
+vgremove $vg --config 'devices { data_alignment = 1024 }'
+check_pv_field_ $dev1 pe_start 512.00K
+
+#COMM 'pvcreate sets data offset next to mda area'
+pvcreate --metadatasize 100k --dataalignment 100k $dev1
+check_pv_field_ $dev1 pe_start 200.00K
+
+#COMM 'pv with LVM1 compatible data alignment can be convereted'
+#compatible == LVM1_PE_ALIGN == 64k
+pvcreate --dataalignment 256k $dev1
+vgcreate -s 1M $vg $dev1
+vgconvert -M1 $vg
+vgconvert -M2 $vg
+check_pv_field_ $dev1 pe_start 256.00K
+vgremove $vg
+
+#COMM 'pv with LVM1 incompatible data alignment cannot be convereted'
+pvcreate --dataalignment 10k $dev1
+vgcreate -s 1M $vg $dev1
+not vgconvert -M1 $vg
+vgremove $vg
+
+#COMM 'vgcfgrestore allows pe_start=0'
+#basically it produces nonsense, but it tests vgcfgrestore,
+#not that final cfg is usable...
+pvcreate --metadatacopies 0 $dev1
+pvcreate $dev2
+vgcreate $vg $dev1 $dev2
+vgcfgbackup -f "$(pwd)/backup.$$" $vg
+sed 's/pe_start = [0-9]*/pe_start = 0/' "$(pwd)/backup.$$" > "$(pwd)/backup.$$1"
+vgcfgrestore -f "$(pwd)/backup.$$1" $vg
+
+# BUG! this one fails, because now we read only label and vgcfgrestore does
+# not fix pe_start in label and there is no text metadta on this PV
+#check_pv_field_ $dev1 pe_start 0
+check_pv_field_ $dev2 pe_start 0
+vgremove $vg
diff --git a/tools/args.h b/tools/args.h
index 8f026fc6..0bfd0281 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -56,6 +56,7 @@ arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0)
arg(nameprefixes_ARG, '\0', "nameprefixes", NULL, 0)
arg(unquoted_ARG, '\0', "unquoted", NULL, 0)
arg(rows_ARG, '\0', "rows", NULL, 0)
+arg(dataalignment_ARG, '\0', "dataalignment", size_kb_arg, 0)
/* Allow some variations */
arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0)
diff --git a/tools/commands.h b/tools/commands.h
index 58c6156b..da202c07 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -462,6 +462,7 @@ xx(pvcreate,
"\t[-M|--metadatatype 1|2]" "\n"
"\t[--metadatacopies #copies]" "\n"
"\t[--metadatasize MetadataSize[kKmMgGtTpPeE]]" "\n"
+ "\t[--dataalignment Alignment[kKmMgGtTpPeE]]" "\n"
"\t[--setphysicalvolumesize PhysicalVolumeSize[kKmMgGtTpPeE]" "\n"
"\t[-t|--test] " "\n"
"\t[-u|--uuid uuid] " "\n"
@@ -471,9 +472,9 @@ xx(pvcreate,
"\t[--version] " "\n"
"\tPhysicalVolume [PhysicalVolume...]\n",
- force_ARG, test_ARG, labelsector_ARG, metadatatype_ARG, metadatacopies_ARG,
- metadatasize_ARG, physicalvolumesize_ARG, restorefile_ARG, uuidstr_ARG,
- yes_ARG, zero_ARG)
+ dataalignment_ARG, force_ARG, test_ARG, labelsector_ARG, metadatatype_ARG,
+ metadatacopies_ARG, metadatasize_ARG, physicalvolumesize_ARG,
+ restorefile_ARG, uuidstr_ARG, yes_ARG, zero_ARG)
xx(pvdata,
"Display the on-disk metadata for physical volume(s)",
diff --git a/tools/pvcreate.c b/tools/pvcreate.c
index db1a0e2f..28522139 100644
--- a/tools/pvcreate.c
+++ b/tools/pvcreate.c
@@ -19,6 +19,7 @@
struct pvcreate_params {
int zero;
uint64_t size;
+ uint64_t data_alignment;
int pvmetadatacopies;
uint64_t pvmetadatasize;
int64_t labelsector;
@@ -177,7 +178,8 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
}
dm_list_init(&mdas);
- if (!(pv = pv_create(cmd, dev, pp->idp, pp->size, pp->pe_start,
+ if (!(pv = pv_create(cmd, dev, pp->idp, pp->size,
+ pp->data_alignment, pp->pe_start,
pp->extent_count, pp->extent_size,
pp->pvmetadatacopies,
pp->pvmetadatasize,&mdas))) {
@@ -305,8 +307,10 @@ static int pvcreate_validate_params(struct cmd_context *cmd,
if (!(cmd->fmt->features & FMT_MDAS) &&
(arg_count(cmd, metadatacopies_ARG) ||
- arg_count(cmd, metadatasize_ARG))) {
- log_error("Metadata parameters only apply to text format");
+ arg_count(cmd, metadatasize_ARG) ||
+ arg_count(cmd, dataalignment_ARG))) {
+ log_error("Metadata and data alignment parameters only "
+ "apply to text format.");
return 0;
}
@@ -329,6 +333,25 @@ static int pvcreate_validate_params(struct cmd_context *cmd,
}
pp->size = arg_uint64_value(cmd, physicalvolumesize_ARG, UINT64_C(0));
+ if (arg_sign_value(cmd, dataalignment_ARG, 0) == SIGN_MINUS) {
+ log_error("Physical volume data alignment may not be negative");
+ return 0;
+ }
+ pp->data_alignment = arg_uint64_value(cmd, dataalignment_ARG, UINT64_C(0));
+
+ if (pp->data_alignment > ULONG_MAX) {
+ log_error("Physical volume data alignment is too big.");
+ return 0;
+ }
+
+ if (pp->data_alignment && pp->pe_start) {
+ if (pp->pe_start % pp->data_alignment)
+ log_warn("WARNING: Ignoring data alignment %" PRIu64
+ " incompatible with --restorefile value (%"
+ PRIu64").", pp->data_alignment, pp->pe_start);
+ pp->data_alignment = 0;
+ }
+
if (arg_sign_value(cmd, metadatasize_ARG, 0) == SIGN_MINUS) {
log_error("Metadata size may not be negative");
return 0;
@@ -349,7 +372,6 @@ static int pvcreate_validate_params(struct cmd_context *cmd,
return 1;
}
-
int pvcreate(struct cmd_context *cmd, int argc, char **argv)
{
int i;
diff --git a/tools/vgconvert.c b/tools/vgconvert.c
index dc9d0237..209d5974 100644
--- a/tools/vgconvert.c
+++ b/tools/vgconvert.c
@@ -133,7 +133,7 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
dm_list_init(&mdas);
if (!(pv = pv_create(cmd, pv_dev(existing_pv),
- &existing_pv->id, size,
+ &existing_pv->id, size, 0,
pe_start, pv_pe_count(existing_pv),
pv_pe_size(existing_pv), pvmetadatacopies,
pvmetadatasize, &mdas))) {
generated by cgit (git 2.34.1) at 2024-06-18 05:41:16 +0000