mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Fix warning for pvcreate over MD linear.
If MD linear device has set rounding (overload chunk size attribute), the pvcreate command prints this warning: /dev/md0 sysfs attr level not in expected format: linear
This commit is contained in:
parent
a73e9a6cfa
commit
d8ff1b1efb
@ -1,5 +1,6 @@
|
||||
Version 2.02.86 -
|
||||
=================================
|
||||
Fix warning in pvcreate for MD linear devices.
|
||||
Move snapshot removal activation logic into lib/activate.
|
||||
Cope with a PV only discovered missing when creating deptree.
|
||||
Abort operation if dm_tree_node_add_target_area fails.
|
||||
|
@ -27,6 +27,7 @@
|
||||
#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512)
|
||||
#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) \
|
||||
- MD_RESERVED_SECTORS)
|
||||
#define MD_MAX_SYSFS_SIZE 64
|
||||
|
||||
static int _dev_has_md_magic(struct device *dev, uint64_t sb_offset)
|
||||
{
|
||||
@ -176,7 +177,7 @@ static int _md_sysfs_attribute_scanf(const char *sysfs_dir,
|
||||
const char *attribute_fmt,
|
||||
void *attribute_value)
|
||||
{
|
||||
char path[PATH_MAX+1], buffer[64];
|
||||
char path[PATH_MAX+1], buffer[MD_MAX_SYSFS_SIZE];
|
||||
FILE *fp;
|
||||
int ret = 0;
|
||||
|
||||
@ -231,15 +232,20 @@ static unsigned long dev_md_chunk_size(const char *sysfs_dir,
|
||||
*/
|
||||
static int dev_md_level(const char *sysfs_dir, struct device *dev)
|
||||
{
|
||||
char level_string[MD_MAX_SYSFS_SIZE];
|
||||
const char *attribute = "level";
|
||||
int level = -1;
|
||||
|
||||
if (_md_sysfs_attribute_scanf(sysfs_dir, dev, attribute,
|
||||
"raid%d", &level) != 1)
|
||||
"%s", &level_string) != 1)
|
||||
return -1;
|
||||
|
||||
log_very_verbose("Device %s %s is raid%d.",
|
||||
dev_name(dev), attribute, level);
|
||||
log_very_verbose("Device %s %s is %s.",
|
||||
dev_name(dev), attribute, level_string);
|
||||
|
||||
/* We only care about raid - ignore linear/faulty/multipath etc. */
|
||||
if (sscanf(level_string, "raid%d", &level) != 1)
|
||||
return -1;
|
||||
|
||||
return level;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user