diff options
104 files changed, 325 insertions, 324 deletions
@@ -1,5 +1,6 @@ Version 2.02.33 - =================================== + Some whitespace tidy-ups. Use stack return macros throughout. Rely upon internally-cached PV labels while corresponding VG lock is held. diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 42f0dc99..71d54f03 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 0a31c3f6..0e3844d2 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -156,9 +156,9 @@ int device_is_usable(dev_t dev) struct dm_task *dmt; struct dm_info info; const char *name; - uint64_t start, length; - char *target_type = NULL; - char *params; + uint64_t start, length; + char *target_type = NULL; + char *params; void *next = NULL; int r = 0; @@ -186,13 +186,13 @@ int device_is_usable(dev_t dev) /* FIXME Also check for mirror block_on_error and mpath no paths */ /* For now, we exclude all mirrors */ - do { - next = dm_get_next_target(dmt, next, &start, &length, - &target_type, ¶ms); - /* Skip if target type doesn't match */ - if (target_type && !strcmp(target_type, "mirror")) + do { + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, ¶ms); + /* Skip if target type doesn't match */ + if (target_type && !strcmp(target_type, "mirror")) goto out; - } while (next); + } while (next); /* FIXME Also check dependencies? */ @@ -629,11 +629,11 @@ static int _add_dev_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, if (!(dlid = build_dlid(dm, lv->lvid.s, layer))) return_0; - log_debug("Getting device info for %s [%s]", name, dlid); - if (!_info(name, dlid, 0, 1, 0, &info, NULL)) { - log_error("Failed to get info for %s [%s].", name, dlid); - return 0; - } + log_debug("Getting device info for %s [%s]", name, dlid); + if (!_info(name, dlid, 0, 1, 0, &info, NULL)) { + log_error("Failed to get info for %s [%s].", name, dlid); + return 0; + } if (info.exists && !dm_tree_add_dev(dtree, info.major, info.minor)) { log_error("Failed to add device (%" PRIu32 ":%" PRIu32") to dtree", @@ -967,10 +967,10 @@ static int _create_lv_symlinks(struct dev_manager *dm, struct dm_tree_node *root name = dm_tree_node_get_name(child); if (name && lvlayer->old_name && *lvlayer->old_name && strcmp(name, lvlayer->old_name)) { - if (!dm_split_lvm_name(dm->mem, lvlayer->old_name, &vgname, &lvname, &layer)) { - log_error("_create_lv_symlinks: Couldn't split up old device name %s", lvlayer->old_name); - return 0; - } + if (!dm_split_lvm_name(dm->mem, lvlayer->old_name, &vgname, &lvname, &layer)) { + log_error("_create_lv_symlinks: Couldn't split up old device name %s", lvlayer->old_name); + return 0; + } fs_rename_lv(lvlayer->lv, name, lvname); } else if (!dev_manager_lv_mknodes(lvlayer->lv)) r = 0; @@ -990,7 +990,7 @@ static int _remove_lv_symlinks(struct dev_manager *dm, struct dm_tree_node *root int r = 1; while ((child = dm_tree_next_child(&handle, root, 0))) { - if (!dm_split_lvm_name(dm->mem, dm_tree_node_get_name(child), &vgname, &lvname, &layer)) { + if (!dm_split_lvm_name(dm->mem, dm_tree_node_get_name(child), &vgname, &lvname, &layer)) { r = 0; continue; } @@ -1019,10 +1019,10 @@ static int _clean_tree(struct dev_manager *dm, struct dm_tree_node *root) if (!(uuid = dm_tree_node_get_uuid(child))) continue; - if (!dm_split_lvm_name(dm->mem, name, &vgname, &lvname, &layer)) { - log_error("_clean_tree: Couldn't split up device name %s.", name); - return 0; - } + if (!dm_split_lvm_name(dm->mem, name, &vgname, &lvname, &layer)) { + log_error("_clean_tree: Couldn't split up device name %s.", name); + return 0; + } /* Not meant to be top level? */ if (!*layer) diff --git a/lib/activate/fs.c b/lib/activate/fs.c index d2ca543c..0c7f5e0f 100644 --- a/lib/activate/fs.c +++ b/lib/activate/fs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -138,7 +138,7 @@ static int _mk_link(const char *dev_dir, const char *vg_name, } /* To reach this point, the VG must have been locked. - * As locking fails if the VG is active under LVM1, it's + * As locking fails if the VG is active under LVM1, it's * now safe to remove any LVM1 devices we find here * (as well as any existing LVM2 symlink). */ if (!lstat(lvm1_group_path, &buf)) { @@ -175,8 +175,8 @@ static int _mk_link(const char *dev_dir, const char *vg_name, } #ifdef HAVE_SELINUX - if (!dm_set_selinux_context(lv_path, S_IFLNK)) - return_0; + if (!dm_set_selinux_context(lv_path, S_IFLNK)) + return_0; #endif return 1; diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 282cdb88..59011f6e 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -135,7 +135,7 @@ struct lvmcache_vginfo *vginfo_from_vgname(const char *vgname, const char *vgid) return NULL; if (vgid) - do + do if (!strncmp(vgid, vginfo->vgid, ID_LEN)) return vginfo; while ((vginfo = vginfo->next)); @@ -335,7 +335,7 @@ struct list *lvmcache_get_vgids(struct cmd_context *cmd, int full_scan) } list_iterate_items(vginfo, &_vginfos) { - if (!str_list_add(cmd->mem, vgids, + if (!str_list_add(cmd->mem, vgids, dm_pool_strdup(cmd->mem, vginfo->vgid))) { log_error("strlist allocation failed"); return NULL; @@ -358,7 +358,7 @@ struct list *lvmcache_get_vgnames(struct cmd_context *cmd, int full_scan) } list_iterate_items(vginfo, &_vginfos) { - if (!str_list_add(cmd->mem, vgnames, + if (!str_list_add(cmd->mem, vgnames, dm_pool_strdup(cmd->mem, vginfo->vgname))) { log_error("strlist allocation failed"); return NULL; @@ -384,7 +384,7 @@ struct list *lvmcache_get_pvids(struct cmd_context *cmd, const char *vgname, return pvids; list_iterate_items(info, &vginfo->infos) { - if (!str_list_add(cmd->mem, pvids, + if (!str_list_add(cmd->mem, pvids, dm_pool_strdup(cmd->mem, info->dev->pvid))) { log_error("strlist allocation failed"); return NULL; @@ -446,12 +446,12 @@ static int _drop_vginfo(struct lvmcache_info *info) if (info->vginfo && list_empty(&info->vginfo->infos)) { dm_hash_remove(_vgname_hash, info->vginfo->vgname); if (info->vginfo->next) { - if (!dm_hash_insert(_vgname_hash, info->vginfo->vgname, info->vginfo->next)) { - log_error("vg hash re-insertion failed: %s", + if (!dm_hash_insert(_vgname_hash, info->vginfo->vgname, info->vginfo->next)) { + log_error("vg hash re-insertion failed: %s", info->vginfo->vgname); - return 0; + return 0; } - } + } if (info->vginfo->vgname) dm_free(info->vginfo->vgname); @@ -477,7 +477,7 @@ void lvmcache_del(struct lvmcache_info *info) _drop_vginfo(info); info->label->labeller->ops->destroy_label(info->label->labeller, - info->label); + info->label); dm_free(info); return; @@ -617,7 +617,7 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, struct lvmcache_vginfo *vginfo, *primary_vginfo; // struct lvmcache_vginfo *old_vginfo, *next; - /* If vgname is NULL and we don't already have a vgname, + /* If vgname is NULL and we don't already have a vgname, * assume ORPHAN - we want every entry to have a vginfo * attached for scanning reasons. */ @@ -643,9 +643,9 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, dm_hash_remove(_vgname_hash, old_vginfo->vgname); if (old_vginfo->next) { if (!dm_hash_insert(_vgname_hash, old_vginfo->vgname, old_vginfo->next)) { - log_error("vg hash re-insertion failed: %s", + log_error("vg hash re-insertion failed: %s", old_vginfo->vgname); - return 0; + return 0; } } } else do { @@ -662,11 +662,11 @@ static int _lvmcache_update_vgname(struct lvmcache_info *info, return 0; } - // Rename so can assume new name does not already exist + // Rename so can assume new name does not already exist if (!dm_hash_insert(_vgname_hash, vginfo->vgname, vginfo->next)) { log_error("vg hash re-insertion failed: %s", vginfo->vgname); - return 0; + return 0; } } else { ***/ diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 78b01ec4..1ecc5805 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -529,7 +529,7 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd) /* * sysfs filter. Only available on 2.6 kernels. Non-critical. - * Listed first because it's very efficient at eliminating + * Listed first because it's very efficient at eliminating * unavailable devices. */ if (find_config_tree_bool(cmd, "devices/sysfs_scan", diff --git a/lib/datastruct/btree.c b/lib/datastruct/btree.c index 963fdb09..9446008c 100644 --- a/lib/datastruct/btree.c +++ b/lib/datastruct/btree.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 2f098bc1..862646b7 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -488,7 +488,7 @@ static int _init_preferred_names(struct cmd_context *cmd) if (v->type != CFG_STRING) { log_error("preferred_names patterns must be enclosed in quotes"); return 0; - } + } count++; } diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 4e25e9d4..137e1cb8 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -336,7 +336,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet) if (dev->open_count && !need_excl) { /* FIXME Ensure we never get here */ - log_debug("WARNING: %s already opened read-only", + log_debug("WARNING: %s already opened read-only", dev_name(dev)); dev->open_count++; } @@ -516,7 +516,7 @@ static int _dev_close(struct device *dev, int immediate) /* Close unless device is known to belong to a locked VG */ if (immediate || - (dev->open_count < 1 && + (dev->open_count < 1 && (!(info = info_from_pvid(dev->pvid, 0)) || !info->vginfo || !vgname_is_locked(info->vginfo->vgname)))) diff --git a/lib/device/device.c b/lib/device/device.c index daef2aee..9d3c1cf7 100644 --- a/lib/device/device.c +++ b/lib/device/device.c @@ -27,16 +27,16 @@ #define PART_OFFSET UINT64_C(0x1BE) struct partition { - uint8_t boot_ind; - uint8_t head; - uint8_t sector; - uint8_t cyl; - uint8_t sys_ind; /* partition type */ - uint8_t end_head; - uint8_t end_sector; - uint8_t end_cyl; - uint32_t start_sect; - uint32_t nr_sects; + uint8_t boot_ind; + uint8_t head; + uint8_t sector; + uint8_t cyl; + uint8_t sys_ind; /* partition type */ + uint8_t end_head; + uint8_t end_sector; + uint8_t end_cyl; + uint32_t start_sect; + uint32_t nr_sects; } __attribute__((packed)); static int _is_partitionable(struct device *dev) diff --git a/lib/display/display.c b/lib/display/display.c index a5263c74..9e5751a5 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -694,7 +694,7 @@ void vgdisplay_colons(const struct volume_group *vg) (uint64_t) vg->extent_count * (vg->extent_size / 2), vg->extent_size / 2, vg->extent_count, - vg->extent_count - vg->free_count, + vg->extent_count - vg->free_count, vg->free_count, uuid[0] ? uuid : "none"); return; diff --git a/lib/error/errseg.c b/lib/error/errseg.c index 6c62f406..df9c5523 100644 --- a/lib/error/errseg.c +++ b/lib/error/errseg.c @@ -77,7 +77,7 @@ static int _errseg_modules_needed(struct dm_pool *mem, return 1; } - + static void _errseg_destroy(const struct segment_type *segtype) { dm_free((void *)segtype); diff --git a/lib/filters/filter-composite.c b/lib/filters/filter-composite.c index f1951e1a..d1606d32 100644 --- a/lib/filters/filter-composite.c +++ b/lib/filters/filter-composite.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index 5d744c71..bf92fc8c 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -97,13 +97,13 @@ int persistent_filter_load(struct dev_filter *f, struct config_tree **cft_out) { struct pfilter *pf = (struct pfilter *) f->private; struct config_tree *cft; - struct stat info; + struct stat info; int r = 0; - if (!stat(pf->file, &info)) + if (!stat(pf->file, &info)) pf->ctime = info.st_ctime; else { - log_very_verbose("%s: stat failed: %s", pf->file, + log_very_verbose("%s: stat failed: %s", pf->file, strerror(errno)); return_0; } diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c index 4ad3fb54..28fe724f 100644 --- a/lib/filters/filter-regex.c +++ b/lib/filters/filter-regex.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c index 133dc54b..81b025de 100644 --- a/lib/filters/filter-sysfs.c +++ b/lib/filters/filter-sysfs.c @@ -236,21 +236,21 @@ static int _read_dev(const char *file, dev_t *result) */ static int _read_devs(struct dev_set *ds, const char *dir, unsigned sysfs_depth) { - struct dirent *d; - DIR *dr; + struct dirent *d; + DIR *dr; struct stat info; char path[PATH_MAX]; char file[PATH_MAX]; dev_t dev = { 0 }; int r = 1; - if (!(dr = opendir(dir))) { - log_sys_error("opendir", dir); - return 0; - } + if (!(dr = opendir(dir))) { + log_sys_error("opendir", dir); + return 0; + } - while ((d = readdir(dr))) { - if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) + while ((d = readdir(dr))) { + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, "..")) continue; if (dm_snprintf(path, sizeof(path), "%s/%s", dir, @@ -278,8 +278,8 @@ static int _read_devs(struct dev_set *ds, const char *dir, unsigned sysfs_depth) } } - if (closedir(dr)) - log_sys_error("closedir", dir); + if (closedir(dr)) + log_sys_error("closedir", dir); return r; } diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c index 9cec298f..9db2cf35 100644 --- a/lib/format1/disk-rep.c +++ b/lib/format1/disk-rep.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -133,15 +133,15 @@ static int _munge_formats(struct pv_disk *pvd) return 0; } - /* UUID too long? */ - if (pvd->pv_uuid[ID_LEN]) { + /* UUID too long? */ + if (pvd->pv_uuid[ID_LEN]) { /* Retain ID_LEN chars from end */ - for (e = ID_LEN; e < sizeof(pvd->pv_uuid); e++) { - if (!pvd->pv_uuid[e]) { - e--; - break; - } - } + for (e = ID_LEN; e < sizeof(pvd->pv_uuid); e++) { + if (!pvd->pv_uuid[e]) { + e--; + break; + } + } for (b = 0; b < ID_LEN; b++) { pvd->pv_uuid[b] = pvd->pv_uuid[++e - ID_LEN]; /* FIXME Remove all invalid chars */ @@ -149,7 +149,7 @@ static int _munge_formats(struct pv_disk *pvd) pvd->pv_uuid[b] = '#'; } memset(&pvd->pv_uuid[ID_LEN], 0, sizeof(pvd->pv_uuid) - ID_LEN); - } + } /* If UUID is missing, create one */ if (pvd->pv_uuid[0] == '\0') { @@ -160,8 +160,8 @@ static int _munge_formats(struct pv_disk *pvd) return 1; } -/* - * If exported, remove "PV_EXP" from end of VG name +/* + * If exported, remove "PV_EXP" from end of VG name */ static void _munge_exported_vg(struct pv_disk *pvd) { @@ -177,8 +177,8 @@ static void _munge_exported_vg(struct pv_disk *pvd) s = sizeof(EXPORTED_TAG); if (!strncmp((char *)pvd->vg_name + l - s + 1, EXPORTED_TAG, s)) { pvd->vg_name[l - s + 1] = '\0'; - pvd->pv_status |= VG_EXPORTED; - } + pvd->pv_status |= VG_EXPORTED; + } } int munge_pvd(struct device *dev, struct pv_disk *pvd) diff --git a/lib/format1/format1.c b/lib/format1/format1.c index 317a516b..5e3f24fe 100644 --- a/lib/format1/format1.c +++ b/lib/format1/format1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -444,7 +444,7 @@ static int _format1_vg_setup(struct format_instance *fid, struct volume_group *v return 1; } -static int _format1_segtype_supported(struct format_instance *fid __attribute((unused)), +static int _format1_segtype_supported(struct format_instance *fid __attribute((unused)), const struct segment_type *segtype) { if (!(segtype->flags & SEG_FORMAT1_SUPPORT)) diff --git a/lib/format1/import-export.c b/lib/format1/import-export.c index bbee8cfc..fc78bbb8 100644 --- a/lib/format1/import-export.c +++ b/lib/format1/import-export.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -618,7 +618,7 @@ int import_snapshots(struct dm_pool *mem __attribute((unused)), struct volume_gr /* insert the snapshot */ if (!vg_add_snapshot(NULL, org, cow, NULL, - org->le_count, + org->le_count, lvd->lv_chunk_size)) { log_err("Couldn't add snapshot."); return 0; diff --git a/lib/format1/import-extents.c b/lib/format1/import-extents.c index b3ab9c73..445080c3 100644 --- a/lib/format1/import-extents.c +++ b/lib/format1/import-extents.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -280,7 +280,7 @@ static int _read_stripes(struct cmd_context *cmd, struct lv_map *lvm) while (first_area_le < total_area_len) { area_len = 1; - /* + /* * Find how many extents are contiguous in all stripes * and so can form part of this segment */ diff --git a/lib/format1/layout.c b/lib/format1/layout.c index 1135fe68..de9b206c 100644 --- a/lib/format1/layout.c +++ b/lib/format1/layout.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format1/lvm1-label.c b/lib/format1/lvm1-label.c index afbcdae6..dd8443d1 100644 --- a/lib/format1/lvm1-label.c +++ b/lib/format1/lvm1-label.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format1/vg_number.c b/lib/format1/vg_number.c index 0dd13d1c..83d25c3c 100644 --- a/lib/format1/vg_number.c +++ b/lib/format1/vg_number.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_pool/disk_rep.c b/lib/format_pool/disk_rep.c index 1d9379f8..a3119239 100644 --- a/lib/format_pool/disk_rep.c +++ b/lib/format_pool/disk_rep.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c index 98530c64..5c09b78c 100644 --- a/lib/format_pool/format_pool.c +++ b/lib/format_pool/format_pool.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c index e454f80f..99edb0d3 100644 --- a/lib/format_pool/import_export.c +++ b/lib/format_pool/import_export.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -215,7 +215,7 @@ static int _add_stripe_seg(struct dm_pool *mem, "striped"))) return_0; - if (!(seg = alloc_lv_segment(mem, segtype, lv, *le_cur, + if (!(seg = alloc_lv_segment(mem, segtype, lv, *le_cur, area_len * usp->num_devs, 0, usp->striping, NULL, usp->num_devs, area_len, 0, 0, 0))) { diff --git a/lib/format_pool/pool_label.c b/lib/format_pool/pool_label.c index 11d21ad1..5b433753 100644 --- a/lib/format_pool/pool_label.c +++ b/lib/format_pool/pool_label.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index 81b6662f..240b1f07 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index 97601fb3..1d2c5ede 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -115,9 +115,9 @@ int archive(struct volume_group *vg) return 0; /* Trap a read-only file system */ - if ((access(vg->cmd->archive_params->dir, R_OK | W_OK | X_OK) == -1) && + if ((access(vg->cmd->archive_params->dir, R_OK | W_OK | X_OK) == -1) && (errno == EROFS)) - return 0; + return 0; log_verbose("Archiving volume group \"%s\" metadata (seqno %u).", vg->name, vg->seqno); @@ -219,9 +219,9 @@ int backup(struct volume_group *vg) return 0; /* Trap a read-only file system */ - if ((access(vg->cmd->backup_params->dir, R_OK | W_OK | X_OK) == -1) && + if ((access(vg->cmd->backup_params->dir, R_OK | W_OK | X_OK) == -1) && (errno == EROFS)) - return 0; + return 0; if (!__backup(vg)) { log_error("Backup of volume group %s metadata failed.", diff --git a/lib/format_text/export.c b/lib/format_text/export.c index f6dac7b6..b88e18ac 100644 --- a/lib/format_text/export.c +++ b/lib/format_text/export.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -37,7 +37,7 @@ typedef int (*nl_fn) (struct formatter * f); * Then argument list is reset and out_with_comment_fn is called again. */ #define _out_with_comment(f, buffer, fmt, ap) \ - do { \ + do { \ va_start(ap, fmt); \ r = f->out_with_comment(f, buffer, fmt, ap); \ va_end(ap); \ diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c index af5e6358..1f33cbc1 100644 --- a/lib/format_text/flags.c +++ b/lib/format_text/flags.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index a789f217..2235f059 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -250,7 +250,7 @@ static int _pv_analyze_mda_raw (const struct format_type * fmt, static int _text_lv_setup(struct format_instance *fid __attribute((unused)), struct logical_volume *lv) { -/******** FIXME Any LV size restriction? +/******** FIXME Any LV size restriction? uint64_t max_size = UINT_MAX; if (lv->size > max_size) { @@ -581,7 +581,7 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg, if (!dev_write(mdac->area.dev, mdac->area.start + MDA_HEADER_SIZE, (size_t) new_wrap, - fidtc->raw_metadata_buf + + fidtc->raw_metadata_buf + mdac->rlocn.size - new_wrap)) goto_out; } @@ -1092,7 +1092,7 @@ const char *vgname_from_mda(const struct format_type *fmt, log_debug("%s: Found metadata at %" PRIu64 " size %" PRIu64 " (in area at %" PRIu64 " size %" PRIu64 - ") for %s (%s)", + ") for %s (%s)", dev_name(dev_area->dev), dev_area->start + rlocn->offset, rlocn->size, dev_area->start, dev_area->size, vgname, uuid); @@ -1330,7 +1330,7 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume else list_init(&info->das); - /* Set pe_start to first aligned sector after any metadata + /* Set pe_start to first aligned sector after any metadata * areas that begin before pe_start */ pv->pe_start = pe_align(); list_iterate_items(mda, &info->mdas) { diff --git a/lib/format_text/import.c b/lib/format_text/import.c index 956c6b0c..1260be55 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -51,7 +51,7 @@ const char *text_vgname_import(const struct format_type *fmt, offset2, size2, checksum_fn, checksum))) goto_out; - /* + /* * Find a set of version functions that can read this file */ for (vsn = &_text_vsn_list[0]; *vsn; vsn++) { @@ -104,7 +104,7 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid, goto out; } - /* + /* * Find a set of version functions that can read this file */ for (vsn = &_text_vsn_list[0]; *vsn; vsn++) { diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c index b0bfa2f7..d2902992 100644 --- a/lib/format_text/import_vsn1.c +++ b/lib/format_text/import_vsn1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -225,24 +225,24 @@ static int _read_pv(struct format_instance *fid, struct dm_pool *mem, pv->pe_alloc_count = 0; pv->fmt = fid->fmt; - /* Fix up pv size if missing or impossibly large */ - if ((!pv->size || pv->size > (1ULL << 62)) && pv->dev) { - if (!dev_get_size(pv->dev, &pv->size)) { - log_error("%s: Couldn't get size.", pv_dev_name(pv)); - return 0; - } - log_verbose("Fixing up missing size (%s) " - "for PV %s", display_size(fid->fmt->cmd, pv->size), - pv_dev_name(pv)); - if (vg) { - size = pv->pe_count * (uint64_t) vg->extent_size + - pv->pe_start; - if (size > pv->size) - log_error("WARNING: Physical Volume %s is too " - "large for underlying device", - pv_dev_name(pv)); - } - } + /* Fix up pv size if missing or impossibly large */ + if ((!pv->size || pv->size > (1ULL << 62)) && pv->dev) { + if (!dev_get_size(pv->dev, &pv->size)) { + log_error("%s: Couldn't get size.", pv_dev_name(pv)); + return 0; + } + log_verbose("Fixing up missing size (%s) " + "for PV %s", display_size(fid->fmt->cmd, pv->size), + pv_dev_name(pv)); + if (vg) { + size = pv->pe_count * (uint64_t) vg->extent_size + + pv->pe_start; + if (size > pv->size) + log_error("WARNING: Physical Volume %s is too " + "large for underlying device", + pv_dev_name(pv)); + } + } if (!alloc_pv_segment_whole_pv(mem, pv)) return_0; @@ -834,7 +834,7 @@ static const char *_read_vgname(const struct format_type *fmt, old_suppress = log_suppress(2); *creation_host = dm_pool_strdup(mem, find_config_str(cft->root, - "creation_host", "")); + "creation_host", "")); log_suppress(old_suppress); /* skip any top-level values */ diff --git a/lib/format_text/tags.c b/lib/format_text/tags.c index cd4bdca0..f9f299de 100644 --- a/lib/format_text/tags.c +++ b/lib/format_text/tags.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index ac78cec3..8fa64f64 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -239,7 +239,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf, list_iterate_items(mda, &info->mdas) { mdac = (struct mda_context *) mda->metadata_locn; - if ((vgname = vgname_from_mda(info->fmt, &mdac->area, + if ((vgname = vgname_from_mda(info->fmt, &mdac->area, &vgid, &vgstatus, &creation_host, &mdac->free_sectors)) && !lvmcache_update_vgname_and_id(info, vgname, diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c index 9e096c4f..dfadbb36 100644 --- a/lib/locking/cluster_locking.c +++ b/lib/locking/cluster_locking.c @@ -104,8 +104,8 @@ static int _send_request(char *inbuf, int inlen, char **retbuf) /* Send it to CLVMD */ rewrite: if ( (err = write(_clvmd_sock, inbuf, inlen)) != inlen) { - if (err == -1 && errno == EINTR) - goto rewrite; + if (err == -1 && errno == EINTR) + goto rewrite; log_error("Error writing data to clvmd: %s", strerror(errno)); return 0; } @@ -113,8 +113,8 @@ static int _send_request(char *inbuf, int inlen, char **retbuf) /* Get the response */ reread: if ((len = read(_clvmd_sock, outbuf, sizeof(struct clvm_header))) < 0) { - if (errno == EINTR) - goto reread; + if (errno == EINTR) + goto reread; log_error("Error reading data from clvmd: %s", strerror(errno)); return 0; } @@ -330,7 +330,7 @@ static int _lock_for_cluster(unsigned char cmd, uint32_t flags, const char *name * locks are cluster-wide. * Also, if the lock is exclusive it makes no sense to try to * acquire it on all nodes, so just do that on the local node too. - * One exception, is that P_ locks /do/ get distributed across + * One exception, is that P_ locks /do/ get distributed across * the cluster because they might have side-effects. */ if (strncmp(name, "P_", 2) && @@ -446,10 +446,10 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags) log_very_verbose("Locking %s %s %s %s%s%s%s (0x%x)", lock_scope, lockname, lock_type, - flags & LCK_NONBLOCK ? "" : "B", - flags & LCK_HOLD ? "H" : "", - flags & LCK_LOCAL ? "L" : "", - flags & LCK_CLUSTER_VG ? "C" : "", + flags & LCK_NONBLOCK ? "" : "B", + flags & LCK_HOLD ? "H" : "", + flags & LCK_LOCAL ? "L" : "", + flags & LCK_CLUSTER_VG ? "C" : "", flags); /* Send a message to the cluster manager */ @@ -479,7 +479,7 @@ void reset_locking(void) _clvmd_sock = _open_local_sock(); if (_clvmd_sock == -1) - stack; + stack; } #ifdef CLUSTER_LOCKING_INTERNAL diff --git a/lib/locking/external_locking.c b/lib/locking/external_locking.c index 4ccef863..1bff650d 100644 --- a/lib/locking/external_locking.c +++ b/lib/locking/external_locking.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 65c9fbf9..a0f7cc44 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/locking/locking.c b/lib/locking/locking.c index b45d56c9..2765f130 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -253,7 +253,7 @@ int init_locking(int type, struct cmd_context *cmd) } if ((type == 2 || type == 3) && - find_config_tree_int(cmd, "locking/fallback_to_local_locking", + find_config_tree_int(cmd, "locking/fallback_to_local_locking", DEFAULT_FALLBACK_TO_LOCAL_LOCKING)) { log_warn("WARNING: Falling back to local file-based locking."); log_warn("Volume Groups with the clustered attribute will " diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c index 0b70951b..77fe2fdc 100644 --- a/lib/locking/no_locking.c +++ b/lib/locking/no_locking.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/log/log.c b/lib/log/log.c index 8c53b5c6..4b9cc582 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 28809b27..cdf072d7 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1679,8 +1679,8 @@ static int _rename_cb(struct cmd_context *cmd, struct logical_volume *lv, */ static int _for_each_sub_lv(struct cmd_context *cmd, struct logical_volume *lv, int (*func)(struct cmd_context *cmd, - struct logical_volume *lv, - void *data), + struct logical_volume *lv, + void *data), void *data) { struct lv_segment *seg; diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 515c35b6..0e5f6732 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -24,7 +24,7 @@ /* * Attempt to merge two adjacent segments. * Currently only supports striped segments on AREA_PV. - * Returns success if successful, in which case 'first' + * Returns success if successful, in which case 'first' * gets adjusted to contain both areas. */ static int _merge(struct lv_segment *first, struct lv_segment *second) @@ -76,7 +76,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg) r = 0; } - area_multiplier = segtype_is_striped(seg->segtype) ? + area_multiplier = segtype_is_striped(seg->segtype) ? seg->area_count : 1; if (seg->area_len * area_multiplier != seg->len) { diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 43167b75..bde628ef 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -36,9 +36,9 @@ #define pv_field(handle, field) \ (((const struct physical_volume *)(handle))->field) -static struct physical_volume *_pv_read(struct cmd_context *cmd, +static struct physical_volume *_pv_read(struct cmd_context *cmd, const char *pv_name, - struct list *mdas, + struct list *mdas, uint64_t *label_sector, int warnings); @@ -51,7 +51,7 @@ static struct physical_volume *_pv_create(const struct format_type *fmt, int pvmetadatacopies, uint64_t pvmetadatasize, struct list *mdas); -static int _pv_write(struct cmd_context *cmd __attribute((unused)), +static int _pv_write(struct cmd_context *cmd __attribute((unused)), struct physical_volume *pv, struct list *mdas, int64_t label_sector); @@ -748,7 +748,7 @@ pv_t *pv_create(const struct format_type *fmt, int pvmetadatacopies, uint64_t pvmetadatasize, struct list *mdas) { - return _pv_create(fmt, dev, id, size, pe_start, + return _pv_create(fmt, dev, id, size, pe_start, existing_extent_count, existing_extent_size, pvmetadatacopies, @@ -1392,7 +1392,7 @@ static int _update_pv_list(struct list *all_pvs, struct volume_group *vg) * inconsistent metadata on disk (i.e. the VG write lock is held). * This guarantees only consistent metadata is returned unless PARTIAL_VG. * If consistent is 0, caller must check whether consistent == 1 on return - * and take appropriate action if it isn't (e.g. abort; get write lock + * and take appropriate action if it isn't (e.g. abort; get write lock * and call vg_read again). * * If precommitted is set, use precommitted metadata if present. @@ -1649,8 +1649,8 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vgname, return vg; } -/* This is only called by lv_from_lvid, which is only called from - * activate.c so we know the appropriate VG lock is already held and +/* This is only called by lv_from_lvid, which is only called from + * activate.c so we know the appropriate VG lock is already held and * the vg_read is therefore safe. */ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, @@ -1688,7 +1688,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, /* FIXME Disabled vgrenames while active for now because we aren't * allowed to do a full scan here any more. */ - // The slow way - full scan required to cope with vgrename + // The slow way - full scan required to cope with vgrename if (!(vgnames = get_vgs(cmd, 2))) { log_error("vg_read_by_vgid: get_vgs failed"); return NULL; @@ -1697,7 +1697,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, list_iterate_items(strl, vgnames) { vgname = strl->str; if (!vgname || is_orphan_vg(vgname)) - continue; // FIXME Unnecessary? + continue; // FIXME Unnecessary? consistent = 0; if ((vg = _vg_read(cmd, vgname, vgid, &consistent, precommitted)) && @@ -1766,9 +1766,9 @@ struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name, } /* FIXME Use label functions instead of PV functions */ -static struct physical_volume *_pv_read(struct cmd_context *cmd, +static struct physical_volume *_pv_read(struct cmd_context *cmd, const char *pv_name, - struct list *mdas, + struct list *mdas, uint64_t *label_sector, int warnings) { @@ -1917,7 +1917,7 @@ int pv_write(struct cmd_context *cmd __attribute((unused)), return _pv_write(cmd, pv, mdas, label_sector); } -static int _pv_write(struct cmd_context *cmd __attribute((unused)), +static int _pv_write(struct cmd_context *cmd __attribute((unused)), struct physical_volume *pv, struct list *mdas, int64_t label_sector) { diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index eb7fd14a..08fbccf8 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -33,8 +33,8 @@ #define MIRROR_DISK_VERSION 2 /* These are the flags that represent the mirror failure restoration policies */ -#define MIRROR_REMOVE 0 -#define MIRROR_ALLOCATE 1 +#define MIRROR_REMOVE 0 +#define MIRROR_ALLOCATE 1 #define MIRROR_ALLOCATE_ANYWHERE 2 /* diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index 96411732..ef60539c 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -146,7 +146,7 @@ struct pv_segment *assign_peg_to_lvseg(struct physical_volume *pv, if (!pv) return &null_pv_segment; - if (!pv_split_segment(pv, pe) || + if (!pv_split_segment(pv, pe) || !pv_split_segment(pv, pe + area_len)) return_NULL; diff --git a/lib/metadata/pv_map.c b/lib/metadata/pv_map.c index 3ff28108..04e80555 100644 --- a/lib/metadata/pv_map.c +++ b/lib/metadata/pv_map.c @@ -56,7 +56,7 @@ static int _create_single_area(struct dm_pool *mem, struct pv_map *pvm, static int _create_alloc_areas_for_pv(struct dm_pool *mem, struct pv_map *pvm, uint32_t start, uint32_t count) { - struct pv_segment *peg; + struct pv_segment *peg; uint32_t pe, end, area_len; /* Only select extents from start to end inclusive */ @@ -67,7 +67,7 @@ static int _create_alloc_areas_for_pv(struct dm_pool *mem, struct pv_map *pvm, pe = start; /* Walk through complete ordered list of device segments */ - list_iterate_items(peg, &pvm->pv->segments) { + list_iterate_items(peg, &pvm->pv->segments) { /* pe holds the next extent we want to check */ /* Beyond the range we're interested in? */ @@ -91,7 +91,7 @@ static int _create_alloc_areas_for_pv(struct dm_pool *mem, struct pv_map *pvm, next: pe = peg->pe + peg->len; - } + } return 1; } diff --git a/lib/metadata/segtype.c b/lib/metadata/segtype.c index 8eaeb8a5..e4a7616f 100644 --- a/lib/metadata/segtype.c +++ b/lib/metadata/segtype.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c index a7cbadfb..e24b20ee 100644 --- a/lib/metadata/snapshot_manip.c +++ b/lib/metadata/snapshot_manip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index 4a6be8c5..1a7a8e31 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -110,19 +110,19 @@ static int _mirrored_text_import(struct lv_segment *seg, const struct config_nod } } - if ((cn = find_config_node(sn, "mirror_log"))) { - if (!cn->v || !cn->v->v.str) { - log_error("Mirror log type must be a string."); - return 0; - } - logname = cn->v->v.str; + if ((cn = find_config_node(sn, "mirror_log"))) { + if (!cn->v || !cn->v->v.str) { + log_error("Mirror log type must be a string."); + return 0; + } + logname = cn->v->v.str; if (!(seg->log_lv = find_lv(seg->lv->vg, logname))) { log_error("Unrecognised mirror log in segment %s.", sn->key); return 0; } seg->log_lv->status |= MIRROR_LOG; - } + } if (logname && !seg->region_size) { log_error("Missing region size for mirror log for segment " @@ -232,7 +232,7 @@ static int _add_log(struct dev_manager *dm, struct lv_segment *seg, uint32_t log_flags = 0; /* - * Use clustered mirror log for non-exclusive activation + * Use clustered mirror log for non-exclusive activation * in clustered VG. */ if ((!(seg->lv->status & ACTIVATE_EXCL) && @@ -266,10 +266,10 @@ static int _add_log(struct dev_manager *dm, struct lv_segment *seg, } static int _mirrored_add_target_line(struct dev_manager *dm, struct dm_pool *mem, - struct cmd_context *cmd, void **target_state, - struct lv_segment *seg, - struct dm_tree_node *node, uint64_t len, - uint32_t *pvmove_mirror_count) + struct cmd_context *cmd, void **target_state, + struct lv_segment *seg, + struct dm_tree_node *node, uint64_t len, + uint32_t *pvmove_mirror_count) { struct mirror_state *mirr_state; uint32_t area_count = seg->area_count; @@ -349,7 +349,7 @@ static int _mirrored_target_present(const struct lv_segment *seg __attribute((un static int _mirrored_present = 0; uint32_t maj, min, patchlevel; unsigned maj2, min2, patchlevel2; - char vsn[80]; + char vsn[80]; if (!_mirrored_checked) { _mirrored_present = target_present("mirror", 1); @@ -361,8 +361,8 @@ static int _mirrored_target_present(const struct lv_segment *seg __attribute((un /* FIXME Move this into libdevmapper */ if (target_version("mirror", &maj, &min, &patchlevel) && - maj == 1 && - ((min >= 1 && min <= 11) || + maj == 1 && + ((min >= 1 && min <= 11) || (min == 0 && driver_version(vsn, sizeof(vsn)) && sscanf(vsn, "%u.%u.%u", &maj2, &min2, &patchlevel2) == 3 && maj2 == 4 && min2 == 5 && patchlevel2 == 0))) /* RHEL4U3 */ diff --git a/lib/misc/crc.c b/lib/misc/crc.c index ffdf43c3..c69ee930 100644 --- a/lib/misc/crc.c +++ b/lib/misc/crc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/misc/lvm-exec.c b/lib/misc/lvm-exec.c index 0ecd4d5d..9ff7214f 100644 --- a/lib/misc/lvm-exec.c +++ b/lib/misc/lvm-exec.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c index 33ed1a5b..3e812d15 100644 --- a/lib/misc/lvm-file.c +++ b/lib/misc/lvm-file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c index d26de9a6..5f26ad40 100644 --- a/lib/misc/lvm-string.c +++ b/lib/misc/lvm-string.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/misc/sharedlib.c b/lib/misc/sharedlib.c index 66906f6c..7622e47d 100644 --- a/lib/misc/sharedlib.c +++ b/lib/misc/sharedlib.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c index d0506947..6a8ef351 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -151,8 +151,8 @@ void memlock_init(struct cmd_context *cmd) "activation/reserved_memory", DEFAULT_RESERVED_MEMORY) * 1024; _default_priority = find_config_tree_int(cmd, - "activation/process_priority", - DEFAULT_PROCESS_PRIORITY); + "activation/process_priority", + DEFAULT_PROCESS_PRIORITY); } #endif diff --git a/lib/report/report.c b/lib/report/report.c index 79a32ce9..ace48d07 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -115,7 +115,7 @@ static int _format_pvsegs(struct dm_pool *mem, struct dm_report_field *field, } if (dm_snprintf(extent_str, sizeof(extent_str), - "%s%" PRIu32 "%s", + "%s%" PRIu32 "%s", range_format ? ":" : "(", extent, range_format ? "-" : ")") < 0) { log_error("Extent number dm_snprintf failed"); @@ -128,7 +128,7 @@ static int _format_pvsegs(struct dm_pool *mem, struct dm_report_field *field, if (range_format) { if (dm_snprintf(extent_str, sizeof(extent_str), - "%" PRIu32, extent + seg->area_len - 1) < 0) { + "%" PRIu32, extent + seg->area_len - 1) < 0) { log_error("Extent number dm_snprintf failed"); return 0; } @@ -830,7 +830,7 @@ static int _pvmdas_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private) { - struct lvmcache_info *info; + struct lvmcache_info *info; uint32_t count; const char *pvid = (const char *)(&((struct id *) data)->uuid); @@ -856,7 +856,7 @@ static int _pvmdafree_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private) { - struct lvmcache_info *info; + struct lvmcache_info *info; uint64_t freespace = UINT64_MAX, mda_free; const char *pvid = (const char *)(&((struct id *) data)->uuid); struct metadata_area *mda; diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index b2f21bfe..c8980be3 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/lib/striped/striped.c b/lib/striped/striped.c index 5278919b..a7fea177 100644 --- a/lib/striped/striped.c +++ b/lib/striped/striped.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -154,11 +154,11 @@ static int _striped_merge_segments(struct lv_segment *seg1, struct lv_segment *s #ifdef DEVMAPPER_SUPPORT static int _striped_add_target_line(struct dev_manager *dm, struct dm_pool *mem __attribute((unused)), - struct cmd_context *cmd __attribute((unused)), + struct cmd_context *cmd __attribute((unused)), void **target_state __attribute((unused)), - struct lv_segment *seg, - struct dm_tree_node *node, uint64_t len, - uint32_t *pvmove_mirror_count __attribute((unused))) + struct lv_segment *seg, + struct dm_tree_node *node, uint64_t len, + uint32_t *pvmove_mirror_count __attribute((unused))) { if (!seg->area_count) { log_error("Internal error: striped add_target_line called " diff --git a/lib/uuid/uuid.c b/lib/uuid/uuid.c index bf2bb081..f231dd1e 100644 --- a/lib/uuid/uuid.c +++ b/lib/uuid/uuid.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -93,10 +93,10 @@ int id_create(struct id *id) if (close(randomfile)) stack; - /* - * Skip out the last 2 chars in randomized creation for LVM1 - * backwards compatibility. - */ + /* + * Skip out the last 2 chars in randomized creation for LVM1 + * backwards compatibility. + */ for (i = 0; i < len; i++) id->uuid[i] = _c[id->uuid[i] % (sizeof(_c) - 3)]; diff --git a/lib/zero/zero.c b/lib/zero/zero.c index 453b10f9..f6cb1cec 100644 --- a/lib/zero/zero.c +++ b/lib/zero/zero.c @@ -40,12 +40,12 @@ static int _zero_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2 #ifdef DEVMAPPER_SUPPORT static int _zero_add_target_line(struct dev_manager *dm __attribute((unused)), - struct dm_pool *mem __attribute((unused)), - struct cmd_context *cmd __attribute((unused)), - void **target_state __attribute((unused)), - struct lv_segment *seg __attribute((unused)), - struct dm_tree_node *node,uint64_t len, - uint32_t *pvmove_mirror_count __attribute((unused))) + struct dm_pool *mem __attribute((unused)), + struct cmd_context *cmd __attribute((unused)), + void **target_state __attribute((unused)), + struct lv_segment *seg __attribute((unused)), + struct dm_tree_node *node,uint64_t len, + uint32_t *pvmove_mirror_count __attribute((unused))) { return dm_tree_node_add_zero_target(node, len); } diff --git a/tools/dumpconfig.c b/tools/dumpconfig.c index 027168d3..8cf1d84b 100644 --- a/tools/dumpconfig.c +++ b/tools/dumpconfig.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/formats.c b/tools/formats.c index 9156cf13..9442eaee 100644 --- a/tools/formats.c +++ b/tools/formats.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvchange.c b/tools/lvchange.c index a231bf9f..1948e3f1 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 82c9b658..c39ba7d5 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -238,7 +238,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, static struct volume_group *_get_lvconvert_vg(struct cmd_context *cmd, const char *lv_name) { - dev_close_all(); + dev_close_all(); return vg_lock_and_read(cmd, extract_vgname(cmd, lv_name), NULL, LCK_VG_WRITE, diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 3ab844d8..5fc2fb61 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -435,7 +435,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, struct cmd_context *cmd, /* * Should we zero the lv. */ - lp->zero = strcmp(arg_str_value(cmd, zero_ARG, + lp->zero = strcmp(arg_str_value(cmd, zero_ARG, (lp->segtype->flags & SEG_CANNOT_BE_ZEROED) ? "n" : "y"), "n"); /* @@ -663,7 +663,7 @@ static int _lvcreate(struct cmd_context *cmd, struct volume_group *vg, log_error("Snapshots and mirrors may not yet be mixed."); return 0; } - + /* Must zero cow */ status |= LVM_WRITE; diff --git a/tools/lvdisplay.c b/tools/lvdisplay.c index f814dd8c..16e7052f 100644 --- a/tools/lvdisplay.c +++ b/tools/lvdisplay.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvextend.c b/tools/lvextend.c index 7ea5ab88..9b59f0f2 100644 --- a/tools/lvextend.c +++ b/tools/lvextend.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvm-static.c b/tools/lvm-static.c index ee5ca09f..4c322469 100644 --- a/tools/lvm-static.c +++ b/tools/lvm-static.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvm.c b/tools/lvm.c index 9a50f962..7a8c36cc 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvmchange.c b/tools/lvmchange.c index 7b4a3b50..8997d89f 100644 --- a/tools/lvmchange.c +++ b/tools/lvmchange.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c index 0a69dbe0..6955ffaa 100644 --- a/tools/lvmcmdlib.c +++ b/tools/lvmcmdlib.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index c6202938..d63ecbf4 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -945,7 +945,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) if (!refresh_toolcontext(cmd)) stack; } - + /* FIXME Move this? */ cmd->current_settings = cmd->default_settings; _apply_settings(cmd); @@ -1159,7 +1159,7 @@ int lvm2_main(int argc, char **argv, unsigned is_static) strcmp(base, "initrd-lvm")) alias = 1; - if (is_static && strcmp(base, "lvm.static") && + if (is_static && strcmp(base, "lvm.static") && path_exists(LVM_SHARED_PATH) && !getenv("LVM_DID_EXEC")) { setenv("LVM_DID_EXEC", base, 1); diff --git a/tools/lvreduce.c b/tools/lvreduce.c index 380d8080..92857f7b 100644 --- a/tools/lvreduce.c +++ b/tools/lvreduce.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvremove.c b/tools/lvremove.c index cab8f6b0..703cf143 100644 --- a/tools/lvremove.c +++ b/tools/lvremove.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvrename.c b/tools/lvrename.c index 165c2e91..1444566b 100644 --- a/tools/lvrename.c +++ b/tools/lvrename.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/lvresize.c b/tools/lvresize.c index dc7510f9..3d4045ff 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -130,7 +130,7 @@ static int confirm_resizefs_reduce(struct cmd_context *cmd, return 1; } -static int do_resizefs_reduce(const struct cmd_context *cmd, +static int do_resizefs_reduce(const struct cmd_context *cmd, const struct volume_group *vg, const struct lvresize_params *lp) { diff --git a/tools/lvscan.c b/tools/lvscan.c index 3286c4de..f63d05ff 100644 --- a/tools/lvscan.c +++ b/tools/lvscan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/polldaemon.c b/tools/polldaemon.c index aa5d8838..7635088a 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -202,7 +202,7 @@ static int _poll_vg(struct cmd_context *cmd, const char *vgname, continue; if (!(name = parms->poll_fns->get_copy_name_from_lv(lv_mirr))) continue; - /* FIXME Need to do the activation from _set_up_pvmove here + /* FIXME Need to do the activation from _set_up_pvmove here * if it's not running and we're not aborting */ if (_check_mirror_status(cmd, vg, lv_mirr, name, parms, &finished) && !finished) diff --git a/tools/pvchange.c b/tools/pvchange.c index d8afa08e..1783bad8 100644 --- a/tools/pvchange.c +++ b/tools/pvchange.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/pvcreate.c b/tools/pvcreate.c index b7932316..1a5baef0 100644 --- a/tools/pvcreate.c +++ b/tools/pvcreate.c @@ -45,10 +45,10 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name) pv = pv_read(cmd, name, NULL, NULL, 0); /* - * If a PV has no MDAs it may appear to be an orphan until the - * metadata is read off another PV in the same VG. Detecting - * this means checking every VG by scanning every PV on the - * system. + * If a PV has no MDAs it may appear to be an orphan until the + * metadata is read off another PV in the same VG. Detecting + * this means checking every VG by scanning every PV on the + * system. */ if (pv && is_orphan(pv)) { if (!scan_vgs_for_pvs(cmd)) @@ -109,7 +109,7 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name) if (dev_is_md(dev, &md_superblock) && ((!arg_count(cmd, uuidstr_ARG) && !arg_count(cmd, restorefile_ARG)) || - arg_count(cmd, yes_ARG) || + arg_count(cmd, yes_ARG) || (yes_no_prompt("Software RAID md superblock " "detected on %s. Wipe it? [y/n] ", name) == 'y'))) { log_print("Wiping software RAID md superblock on %s", name); diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c index a2dacf40..6ba75ea4 100644 --- a/tools/pvdisplay.c +++ b/tools/pvdisplay.c @@ -30,10 +30,10 @@ static int _pvdisplay_single(struct cmd_context *cmd, vg_name = pv_vg_name(pv); if (!(vg = vg_lock_and_read(cmd, vg_name, (char *)&pv->vgid, LCK_VG_READ, CLUSTERED, 0))) { - log_error("Skipping volume group %s", vg_name); + log_error("Skipping volume group %s", vg_name); /* FIXME If CLUSTERED should return ECMD_PROCESSED here */ - return ECMD_FAILED; - } + return ECMD_FAILED; + } /* * Replace possibly incomplete PV structure with new one @@ -42,8 +42,8 @@ static int _pvdisplay_single(struct cmd_context *cmd, if (!(pvl = find_pv_in_vg(vg, pv_name))) { log_error("Unable to find \"%s\" in volume group \"%s\"", pv_name, vg->name); - ret = ECMD_FAILED; - goto out; + ret = ECMD_FAILED; + goto out; } pv = pvl->pv; @@ -52,7 +52,7 @@ static int _pvdisplay_single(struct cmd_context *cmd, if (is_orphan(pv)) size = pv_size(pv); else - size = (pv_pe_count(pv) - pv_pe_alloc_count(pv)) * + size = (pv_pe_count(pv) - pv_pe_alloc_count(pv)) * pv_pe_size(pv); if (arg_count(cmd, short_ARG)) { @@ -80,8 +80,8 @@ static int _pvdisplay_single(struct cmd_context *cmd, pvdisplay_segments(pv); out: - if (vg_name) - unlock_vg(cmd, vg_name); + if (vg_name) + unlock_vg(cmd, vg_name); return ret; } diff --git a/tools/pvmove.c b/tools/pvmove.c index 32619421..80e5a5ff 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -530,12 +530,12 @@ int pvmove(struct cmd_context *cmd, int argc, char **argv) if (!(segtype = get_segtype_from_string(cmd, "mirror"))) return_0; - if (activation() && segtype->ops->target_present && - !segtype->ops->target_present(NULL)) { - log_error("%s: Required device-mapper target(s) not " - "detected in your kernel", segtype->name); - return 0; - } + if (activation() && segtype->ops->target_present && + !segtype->ops->target_present(NULL)) { + log_error("%s: Required device-mapper target(s) not " + "detected in your kernel", segtype->name); + return 0; + } if (argc) { pv_name = argv[0]; diff --git a/tools/pvresize.c b/tools/pvresize.c index 1b10dd34..5508fda3 100644 --- a/tools/pvresize.c +++ b/tools/pvresize.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. * Copyright (C) 2005 Zak Kipling. All rights reserved. * diff --git a/tools/pvscan.c b/tools/pvscan.c index 54b62b74..bbe606c1 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -89,9 +89,9 @@ static void _pvscan_display_single(struct cmd_context *cmd, log_print("PV %-*s VG %-*s %s [%s / %s free]", pv_max_name_len, pv_tmp_name, vg_max_name_len, vg_tmp_name, pv->fmt ? pv->fmt->name : " ", - display_size(cmd, (uint64_t) pv_pe_count(pv) * + display_size(cmd, (uint64_t) pv_pe_count(pv) * pv_pe_size(pv)), - display_size(cmd, (uint64_t) (pv_pe_count(pv) - + display_size(cmd, (uint64_t) (pv_pe_count(pv) - pv_pe_alloc_count(pv)) * pv_pe_size(pv))); return; diff --git a/tools/reporter.c b/tools/reporter.c index 44745f4b..2504f206 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -111,7 +111,7 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg, goto out; } - pv = pvl->pv; + pv = pvl->pv; } if (!report_object(handle, vg, NULL, pv, NULL, NULL)) @@ -132,7 +132,7 @@ static int _pvs_in_vg(struct cmd_context *cmd, const char *vg_name, if (!vg) { log_error("Volume group %s not found", vg_name); return ECMD_FAILED; - } + } return process_each_pv_in_vg(cmd, vg, NULL, handle, &_pvs_single); } @@ -145,7 +145,7 @@ static int _pvsegs_in_vg(struct cmd_context *cmd, const char *vg_name, if (!vg) { log_error("Volume group %s not found", vg_name); return ECMD_FAILED; - } + } return process_each_pv_in_vg(cmd, vg, NULL, handle, &_pvsegs_single); } diff --git a/tools/segtypes.c b/tools/segtypes.c index e8d3a94d..504dcc1f 100644 --- a/tools/segtypes.c +++ b/tools/segtypes.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/toollib.c b/tools/toollib.c index 58804565..04714577 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -736,13 +736,13 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv, continue; } - /* - * If a PV has no MDAs it may appear to be an + /* + * If a PV has no MDAs it may appear to be an * orphan until the metadata is read off * another PV in the same VG. Detecting this * means checking every VG by scanning every * PV on the system. - */ + */ if (!scanned && is_orphan(pv)) { if (!scan_vgs_for_pvs(cmd)) { stack; @@ -1251,7 +1251,7 @@ int fill_vg_create_params(struct cmd_context *cmd, arg_uint_value(cmd, physicalextentsize_ARG, vp_def->extent_size); if (arg_count(cmd, clustered_ARG)) - vp_new->clustered = + vp_new->clustered = !strcmp(arg_str_value(cmd, clustered_ARG, vp_def->clustered ? "y":"n"), "y"); else diff --git a/tools/vgcfgbackup.c b/tools/vgcfgbackup.c index d4fdac0e..90f64b37 100644 --- a/tools/vgcfgbackup.c +++ b/tools/vgcfgbackup.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index a19369e6..3c66b62b 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgchange.c b/tools/vgchange.c index 7503c498..634f6201 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -256,8 +256,8 @@ static int _vgchange_clustered(struct cmd_context *cmd, } if (clustered) { - list_iterate_items(lvl, &vg->lvs) { - if (lv_is_origin(lvl->lv) || lv_is_cow(lvl->lv)) { + list_iterate_items(lvl, &vg->lvs) { + if (lv_is_origin(lvl->lv) || lv_is_cow(lvl->lv)) { log_error("Volume group %s contains snapshots " "that are not yet supported.", vg->name); diff --git a/tools/vgck.c b/tools/vgck.c index e0438217..1fb6c03c 100644 --- a/tools/vgck.c +++ b/tools/vgck.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c index 2980bb56..cc51bcab 100644 --- a/tools/vgdisplay.c +++ b/tools/vgdisplay.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -89,8 +89,8 @@ int vgdisplay(struct cmd_context *cmd, int argc, char **argv) /* FIXME -D disk_ARG is now redundant */ -/********* FIXME: Do without this - or else 2(+) passes! - Figure out longest volume group name +/********* FIXME: Do without this - or else 2(+) passes! + Figure out longest volume group name for (c = opt; opt < argc; opt++) { len = strlen(argv[opt]); if (len > max_len) @@ -101,8 +101,8 @@ int vgdisplay(struct cmd_context *cmd, int argc, char **argv) process_each_vg(cmd, argc, argv, LCK_VG_READ, 0, NULL, vgdisplay_single); -/******** FIXME Need to count number processed - Add this to process_each_vg if arg_count(cmd,activevolumegroups_ARG) ? +/******** FIXME Need to count number processed + Add this to process_each_vg if arg_count(cmd,activevolumegroups_ARG) ? if (opt == argc) { log_print("no "); diff --git a/tools/vgexport.c b/tools/vgexport.c index e084f999..a2aee936 100644 --- a/tools/vgexport.c +++ b/tools/vgexport.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgextend.c b/tools/vgextend.c index 4c02a1ec..089c44eb 100644 --- a/tools/vgextend.c +++ b/tools/vgextend.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -42,7 +42,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) log_verbose("Checking for volume group \"%s\"", vg_name); if (!(vg = vg_lock_and_read(cmd, vg_name, NULL, LCK_VG_WRITE | LCK_NONBLOCK, - CLUSTERED | EXPORTED_VG | + CLUSTERED | EXPORTED_VG | LVM_WRITE | RESIZEABLE_VG, CORRECT_INCONSISTENT | FAIL_INCONSISTENT))) { unlock_vg(cmd, VG_ORPHANS); diff --git a/tools/vgimport.c b/tools/vgimport.c index 71ee4754..8896c008 100644 --- a/tools/vgimport.c +++ b/tools/vgimport.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 1296056f..8c1f4a6f 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -70,23 +70,23 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, list_iterate_items(lvl2, &vg_from->lvs) { union lvid *lvid2 = &lvl2->lv->lvid; - if (id_equal(&lvid1->id[1], &lvid2->id[1])) { + if (id_equal(&lvid1->id[1], &lvid2->id[1])) { if (!id_create(&lvid2->id[1])) { log_error("Failed to generate new " "random LVID for %s", lvl2->lv->name); goto bad; } - if (!id_write_format(&lvid2->id[1], uuid, + if (!id_write_format(&lvid2->id[1], uuid, sizeof(uuid))) - goto_bad; + goto_bad; log_verbose("Changed LVID for %s to %s", lvl2->lv->name, uuid); } } } - + while (!list_empty(&vg_from->lvs)) { struct list *lvh = vg_from->lvs.n; diff --git a/tools/vgmknodes.c b/tools/vgmknodes.c index 3c0765d2..cb5b2799 100644 --- a/tools/vgmknodes.c +++ b/tools/vgmknodes.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgreduce.c b/tools/vgreduce.c index 375c039d..4c182466 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -100,7 +100,7 @@ static int _remove_lv(struct cmd_context *cmd, struct logical_volume *lv, } /* - * If LV is active, replace it with error segment + * If LV is active, replace it with error segment * and add to list of LVs to be removed later. * Doesn't apply to snapshots/origins yet - they're already deactivated. */ diff --git a/tools/vgremove.c b/tools/vgremove.c index bf1ea255..8c4357e1 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -41,7 +41,7 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv) } ret = process_each_vg(cmd, argc, argv, - LCK_VG_WRITE | LCK_NONBLOCK, 1, + LCK_VG_WRITE | LCK_NONBLOCK, 1, NULL, &vgremove_single); unlock_vg(cmd, VG_ORPHANS); diff --git a/tools/vgrename.c b/tools/vgrename.c index 0d61a19c..6cdfaf2a 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -150,8 +150,8 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path, vg_name_old, vg_name_new); /* FIXME lvmcache corruption - vginfo duplicated instead of renamed */ - persistent_filter_wipe(cmd->filter); - lvmcache_destroy(); + persistent_filter_wipe(cmd->filter); + lvmcache_destroy(); return 1; diff --git a/tools/vgscan.c b/tools/vgscan.c index 65e678f9..e444e8d0 100644 --- a/tools/vgscan.c +++ b/tools/vgscan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 3fc0691a..1ec67fdd 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. @@ -181,7 +181,7 @@ static int _move_mirrors(struct volume_group *vg_from, if (!(lv->status & MIRRORED)) continue; - seg = first_seg(lv); + seg = first_seg(lv); seg_in = 0; for (s = 0; s < seg->area_count; s++) @@ -190,8 +190,8 @@ static int _move_mirrors(struct volume_group *vg_from, log_in = (!seg->log_lv || _lv_is_in_vg(vg_to, seg->log_lv)); - if ((seg_in && seg_in < seg->area_count) || - (seg_in && seg->log_lv && !log_in) || + if ((seg_in && seg_in < seg->area_count) || + (seg_in && seg->log_lv && !log_in) || (!seg_in && seg->log_lv && log_in)) { log_error("Can't split mirror %s between " "two Volume Groups", lv->name); |