From 7063efe1bda990936fa92fc9778f6ec823deaba7 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Fri, 20 Aug 2010 22:24:58 +0000 Subject: [PATCH] Switch to using configure --with-default-data-alignment= to establish DEFAULT_DATA_ALIGNMENT. Again, 0=64KiB, 1=1MiB, 2=2MiB Default is 1. --- configure.in | 10 ++++++++++ doc/example.conf.in | 2 +- lib/config/defaults.h | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 3c3915115..18484f72f 100644 --- a/configure.in +++ b/configure.in @@ -1184,6 +1184,15 @@ AC_ARG_WITH(default-locking-dir, AC_DEFINE_UNQUOTED(DEFAULT_LOCK_DIR, ["$DEFAULT_LOCK_DIR"], [Name of default locking directory.]) +################################################################################ +dnl -- Setup default data alignment +AC_ARG_WITH(default-data-alignment, + AC_HELP_STRING([--with-default-data-alignment=NUM], + [set the default data alignment in MiB [[1]]]), + DEFAULT_DATA_ALIGNMENT=$withval, DEFAULT_DATA_ALIGNMENT=1) +AC_DEFINE_UNQUOTED(DEFAULT_DATA_ALIGNMENT, [$DEFAULT_DATA_ALIGNMENT], + [Default data alignment.]) + ################################################################################ dnl -- which kernel interface to use (ioctl only) AC_MSG_CHECKING(for kernel interface choice) @@ -1244,6 +1253,7 @@ AC_SUBST(DEFAULT_SYS_DIR) AC_SUBST(DEFAULT_ARCHIVE_SUBDIR) AC_SUBST(DEFAULT_BACKUP_SUBDIR) AC_SUBST(DEFAULT_CACHE_SUBDIR) +AC_SUBST(DEFAULT_DATA_ALIGNMENT) AC_SUBST(DEFAULT_LOCK_DIR) AC_SUBST(DEFAULT_RUN_DIR) AC_SUBST(DEVMAPPER) diff --git a/doc/example.conf.in b/doc/example.conf.in index 6c75f8c98..03292beb5 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -101,7 +101,7 @@ devices { # Default alignment of the start of a data area in MB. If set to 0, # a small value of 64KB will be used, which was the default until # LVM2 version 2.02.73. Set to 1 for 1MiB, 2 for 2MiB, etc. - default_data_alignment = 1 + # default_data_alignment = @DEFAULT_DATA_ALIGNMENT@ # By default, the start of a PV's data area will be a multiple of # the 'minimum_io_size' or 'optimal_io_size' exposed in sysfs. diff --git a/lib/config/defaults.h b/lib/config/defaults.h index d9c9e3b28..e4db65e9d 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h @@ -34,7 +34,6 @@ #define DEFAULT_MD_CHUNK_ALIGNMENT 1 #define DEFAULT_IGNORE_SUSPENDED_DEVICES 1 #define DEFAULT_REQUIRE_RESTOREFILE_WITH_UUID 1 -#define DEFAULT_DATA_ALIGNMENT 1 #define DEFAULT_DATA_ALIGNMENT_OFFSET_DETECTION 1 #define DEFAULT_DATA_ALIGNMENT_DETECTION 1 -- 2.43.5