mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
00b610e542
Print [source:handler] in filters' debug messages only if external device info source other than "none" is used. $ lvmconfig --type full devices/external_device_info_source external_device_info_source="none Before this patch (from the -vvvv log): filters/filter-usable.c:47 /dev/mapper/test: Skipping: Too small to hold a PV [none:(nil)] filters/filter-md.c:33 /dev/sdb: Skipping md component device [none:(nil)] filters/filter-partitioned.c:25 /dev/vda: Skipping: Partition table signature found [none:(nil)] With this patch applied: filters/filter-usable.c:44 /dev/mapper/test: Skipping: Too small to hold a PV filters/filter-md.c:35 /dev/sdb: Skipping md component device filters/filter-partitioned.c:27 /dev/vda: Skipping: Partition table signature found
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
|
|
* Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This file is part of LVM2.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU Lesser General Public License v.2.1.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "lib.h"
|
|
#include "filter.h"
|
|
|
|
#define MSG_SKIPPING "%s: Skipping: Partition table signature found"
|
|
|
|
static int _passes_partitioned_filter(struct dev_filter *f, struct device *dev)
|
|
{
|
|
struct dev_types *dt = (struct dev_types *) f->private;
|
|
|
|
if (dev_is_partitioned(dt, dev)) {
|
|
if (dev->ext.src == DEV_EXT_NONE)
|
|
log_debug_devs(MSG_SKIPPING, dev_name(dev));
|
|
else
|
|
log_debug_devs(MSG_SKIPPING " [%s:%p]", dev_name(dev),
|
|
dev_ext_name(dev), dev->ext.handle);
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void _partitioned_filter_destroy(struct dev_filter *f)
|
|
{
|
|
if (f->use_count)
|
|
log_error(INTERNAL_ERROR "Destroying partitioned filter while in use %u times.", f->use_count);
|
|
|
|
dm_free(f);
|
|
}
|
|
|
|
struct dev_filter *partitioned_filter_create(struct dev_types *dt)
|
|
{
|
|
struct dev_filter *f;
|
|
|
|
if (!(f = dm_zalloc(sizeof(struct dev_filter)))) {
|
|
log_error("Partitioned filter allocation failed");
|
|
return NULL;
|
|
}
|
|
|
|
f->passes_filter = _passes_partitioned_filter;
|
|
f->destroy = _partitioned_filter_destroy;
|
|
f->use_count = 0;
|
|
f->private = dt;
|
|
|
|
log_debug_devs("Partitioned filter initialised.");
|
|
|
|
return f;
|
|
}
|