From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19482 invoked by alias); 30 Sep 2010 13:04:58 -0000 Received: (qmail 19465 invoked by uid 9657); 30 Sep 2010 13:04:57 -0000 Date: Thu, 30 Sep 2010 13:04:00 -0000 Message-ID: <20100930130457.19463.qmail@sourceware.org> From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 include/.symlinks.in lib/Makefile.in lib/ ... Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-09/txt/msg00020.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2010-09-30 13:04:56 Modified files: include : .symlinks.in lib : Makefile.in lib/metadata : metadata-exported.h metadata.c metadata.h Log message: Refactor metadata.[ch] into vg.[ch] for vg functions. The metadata.[ch] files are very large. This patch makes a first attempt at separating out vg functions and data, particularly related to the reporting fields calculations. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/include/.symlinks.in.diff?cvsroot=lvm2&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.105&r2=1.106 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.165&r2=1.166 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.397&r2=1.398 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.h.diff?cvsroot=lvm2&r1=1.218&r2=1.219 --- LVM2/include/.symlinks.in 2010/08/20 12:44:47 1.3 +++ LVM2/include/.symlinks.in 2010/09/30 13:04:55 1.4 @@ -35,6 +35,7 @@ @top_srcdir@/lib/metadata/metadata-exported.h @top_srcdir@/lib/metadata/pv_alloc.h @top_srcdir@/lib/metadata/segtype.h +@top_srcdir@/lib/metadata/vg.h @top_srcdir@/lib/mm/memlock.h @top_srcdir@/lib/mm/xlate.h @top_builddir@/lib/misc/configure.h --- LVM2/lib/Makefile.in 2010/08/20 12:44:47 1.105 +++ LVM2/lib/Makefile.in 2010/09/30 13:04:55 1.106 @@ -82,6 +82,7 @@ metadata/replicator_manip.c \ metadata/segtype.c \ metadata/snapshot_manip.c \ + metadata/vg.c \ misc/crc.c \ misc/lvm-exec.c \ misc/lvm-file.c \ --- LVM2/lib/metadata/metadata-exported.h 2010/07/08 18:24:30 1.165 +++ LVM2/lib/metadata/metadata-exported.h 2010/09/30 13:04:56 1.166 @@ -22,6 +22,7 @@ #define _LVM_METADATA_EXPORTED_H #include "uuid.h" +#include "vg.h" #define MAX_STRIPES 128U #define SECTOR_SHIFT 9L @@ -122,15 +123,6 @@ /* Ordered list - see lv_manip.c */ typedef enum { - ALLOC_INVALID, - ALLOC_CONTIGUOUS, - ALLOC_CLING, - ALLOC_NORMAL, - ALLOC_ANYWHERE, - ALLOC_INHERIT -} alloc_policy_t; - -typedef enum { AREA_UNASSIGNED, AREA_PV, AREA_LV @@ -229,70 +221,6 @@ void *private; }; -struct volume_group { - struct cmd_context *cmd; - struct dm_pool *vgmem; - struct format_instance *fid; - struct dm_list *cmd_vgs;/* List of wanted/locked and opened VGs */ - uint32_t cmd_missing_vgs;/* Flag marks missing VG */ - uint32_t seqno; /* Metadata sequence number */ - - alloc_policy_t alloc; - uint64_t status; - - struct id id; - char *name; - char *old_name; /* Set during vgrename and vgcfgrestore */ - char *system_id; - - uint32_t extent_size; - uint32_t extent_count; - uint32_t free_count; - - uint32_t max_lv; - uint32_t max_pv; - - /* physical volumes */ - uint32_t pv_count; - struct dm_list pvs; - - /* - * logical volumes - * The following relationship should always hold: - * dm_list_size(lvs) = user visible lv_count + snapshot_count + other invisible LVs - * - * Snapshots consist of 2 instances of "struct logical_volume": - * - cow (lv_name is visible to the user) - * - snapshot (lv_name is 'snapshotN') - * - * Mirrors consist of multiple instances of "struct logical_volume": - * - one for the mirror log - * - one for each mirror leg - * - one for the user-visible mirror LV - */ - struct dm_list lvs; - - struct dm_list tags; - - /* - * FIXME: Move the next fields into a different struct? - */ - - /* - * List of removed physical volumes by pvreduce. - * They have to get cleared on vg_commit. - */ - struct dm_list removed_pvs; - uint32_t open_mode; /* FIXME: read or write - check lock type? */ - - /* - * Store result of the last vg_read(). - * 0 for success else appropriate FAILURE_* bits set. - */ - uint32_t read_status; - uint32_t mda_copies; /* target number of mdas for this VG */ -}; - /* There will be one area for each stripe */ struct lv_segment_area { area_type_t type; @@ -501,6 +429,7 @@ int is_orphan_vg(const char *vg_name); int is_orphan(const struct physical_volume *pv); int is_missing_pv(const struct physical_volume *pv); +int vg_missing_pv_count(const struct volume_group *vg); int vgs_are_compatible(struct cmd_context *cmd, struct volume_group *vg_from, struct volume_group *vg_to); @@ -552,11 +481,6 @@ struct pvcreate_params *pp); int vg_reduce(struct volume_group *vg, char *pv_name); int vg_change_tag(struct volume_group *vg, const char *tag, int add_tag); -int vg_set_extent_size(struct volume_group *vg, uint32_t new_extent_size); -int vg_set_max_lv(struct volume_group *vg, uint32_t max_lv); -int vg_set_max_pv(struct volume_group *vg, uint32_t max_pv); -int vg_set_alloc_policy(struct volume_group *vg, alloc_policy_t alloc); -int vg_set_clustered(struct volume_group *vg, int clustered); int vg_split_mdas(struct cmd_context *cmd, struct volume_group *vg_from, struct volume_group *vg_to); /* FIXME: Investigate refactoring these functions to take a pv ISO pv_list */ @@ -746,10 +670,6 @@ int vg_check_status(const struct volume_group *vg, uint64_t status); -/* - * Returns visible LV count - number of LVs from user perspective - */ -unsigned vg_visible_lvs(const struct volume_group *vg); /* * Check if the VG reached maximal LVs count (if set) @@ -876,21 +796,6 @@ uint64_t lv_size(const struct logical_volume *lv); -int vg_missing_pv_count(const struct volume_group *vg); -uint32_t vg_seqno(const struct volume_group *vg); -uint64_t vg_status(const struct volume_group *vg); -uint64_t vg_size(const struct volume_group *vg); -uint64_t vg_free(const struct volume_group *vg); -uint64_t vg_extent_size(const struct volume_group *vg); -uint64_t vg_extent_count(const struct volume_group *vg); -uint64_t vg_free_count(const struct volume_group *vg); -uint64_t vg_pv_count(const struct volume_group *vg); -uint64_t vg_max_pv(const struct volume_group *vg); -uint64_t vg_max_lv(const struct volume_group *vg); -uint32_t vg_mda_count(const struct volume_group *vg); -uint32_t vg_mda_used_count(const struct volume_group *vg); -uint32_t vg_mda_copies(const struct volume_group *vg); -int vg_set_mda_copies(struct volume_group *vg, uint32_t mda_copies); int vg_check_write_mode(struct volume_group *vg); #define vg_is_clustered(vg) (vg_status((vg)) & CLUSTERED) #define vg_is_exported(vg) (vg_status((vg)) & EXPORTED_VG) --- LVM2/lib/metadata/metadata.c 2010/09/23 12:02:34 1.397 +++ LVM2/lib/metadata/metadata.c 2010/09/30 13:04:56 1.398 @@ -1021,31 +1021,6 @@ return (uint64_t) size / extent_size; } -static int _recalc_extents(uint32_t *extents, const char *desc1, - const char *desc2, uint32_t old_size, - uint32_t new_size) -{ - uint64_t size = (uint64_t) old_size * (*extents); - - if (size % new_size) { - log_error("New size %" PRIu64 " for %s%s not an exact number " - "of new extents.", size, desc1, desc2); - return 0; - } - - size /= new_size; - - if (size > UINT32_MAX) { - log_error("New extent count %" PRIu64 " for %s%s exceeds " - "32 bits.", size, desc1, desc2); - return 0; - } - - *extents = (uint32_t) size; - - return 1; -} - static dm_bitset_t _bitset_with_random_bits(struct dm_pool *mem, uint32_t num_bits, uint32_t num_set_bits, unsigned *seed) { @@ -1220,22 +1195,6 @@ return 1; } -uint32_t vg_mda_copies(const struct volume_group *vg) -{ - return vg->mda_copies; -} - -int vg_set_mda_copies(struct volume_group *vg, uint32_t mda_copies) -{ - vg->mda_copies = mda_copies; - - /* FIXME Use log_verbose when this is due to specific cmdline request. */ - log_debug("Setting mda_copies to %"PRIu32" for VG %s", - mda_copies, vg->name); - - return 1; -} - uint64_t find_min_mda_size(struct dm_list *mdas) { uint64_t min_mda_size = UINT64_MAX, mda_size; @@ -1255,285 +1214,6 @@ return min_mda_size; } -uint64_t vg_mda_size(const struct volume_group *vg) -{ - return find_min_mda_size(&vg->fid->metadata_areas_in_use); -} - -uint64_t vg_mda_free(const struct volume_group *vg) -{ - uint64_t freespace = UINT64_MAX, mda_free; - struct metadata_area *mda; - - dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) { - if (!mda->ops->mda_free_sectors) - continue; - mda_free = mda->ops->mda_free_sectors(mda); - if (mda_free < freespace) - freespace = mda_free; - } - - if (freespace == UINT64_MAX) - freespace = UINT64_C(0); - return freespace; -} - -int vg_set_extent_size(struct volume_group *vg, uint32_t new_size) -{ - uint32_t old_size = vg->extent_size; - struct pv_list *pvl; - struct lv_list *lvl; - struct physical_volume *pv; - struct logical_volume *lv; - struct lv_segment *seg; - struct pv_segment *pvseg; - uint32_t s; - - if (!vg_is_resizeable(vg)) { - log_error("Volume group \"%s\" must be resizeable " - "to change PE size", vg->name); - return 0; - } - - if (!new_size) { - log_error("Physical extent size may not be zero"); - return 0; - } - - if (new_size == vg->extent_size) - return 1; - - if (new_size & (new_size - 1)) { - log_error("Physical extent size must be a power of 2."); - return 0; - } - - if (new_size > vg->extent_size) { - if ((uint64_t) vg_size(vg) % new_size) { - /* FIXME Adjust used PV sizes instead */ - log_error("New extent size is not a perfect fit"); - return 0; - } - } - - vg->extent_size = new_size; - - if (vg->fid->fmt->ops->vg_setup && - !vg->fid->fmt->ops->vg_setup(vg->fid, vg)) - return_0; - - if (!_recalc_extents(&vg->extent_count, vg->name, "", old_size, - new_size)) - return_0; - - if (!_recalc_extents(&vg->free_count, vg->name, " free space", - old_size, new_size)) - return_0; - - /* foreach PV */ - dm_list_iterate_items(pvl, &vg->pvs) { - pv = pvl->pv; - - pv->pe_size = new_size; - if (!_recalc_extents(&pv->pe_count, pv_dev_name(pv), "", - old_size, new_size)) - return_0; - - if (!_recalc_extents(&pv->pe_alloc_count, pv_dev_name(pv), - " allocated space", old_size, new_size)) - return_0; - - /* foreach free PV Segment */ - dm_list_iterate_items(pvseg, &pv->segments) { - if (pvseg_is_allocated(pvseg)) - continue; - - if (!_recalc_extents(&pvseg->pe, pv_dev_name(pv), - " PV segment start", old_size, - new_size)) - return_0; - if (!_recalc_extents(&pvseg->len, pv_dev_name(pv), - " PV segment length", old_size, - new_size)) - return_0; - } - } - - /* foreach LV */ - dm_list_iterate_items(lvl, &vg->lvs) { - lv = lvl->lv; - - if (!_recalc_extents(&lv->le_count, lv->name, "", old_size, - new_size)) - return_0; - - dm_list_iterate_items(seg, &lv->segments) { - if (!_recalc_extents(&seg->le, lv->name, - " segment start", old_size, - new_size)) - return_0; - - if (!_recalc_extents(&seg->len, lv->name, - " segment length", old_size, - new_size)) - return_0; - - if (!_recalc_extents(&seg->area_len, lv->name, - " area length", old_size, - new_size)) - return_0; - - if (!_recalc_extents(&seg->extents_copied, lv->name, - " extents moved", old_size, - new_size)) - return_0; - - /* foreach area */ - for (s = 0; s < seg->area_count; s++) { - switch (seg_type(seg, s)) { - case AREA_PV: - if (!_recalc_extents - (&seg_pe(seg, s), - lv->name, - " pvseg start", old_size, - new_size)) - return_0; - if (!_recalc_extents - (&seg_pvseg(seg, s)->len, - lv->name, - " pvseg length", old_size, - new_size)) - return_0; - break; - case AREA_LV: - if (!_recalc_extents - (&seg_le(seg, s), lv->name, - " area start", old_size, - new_size)) - return_0; - break; - case AREA_UNASSIGNED: - log_error("Unassigned area %u found in " - "segment", s); - return 0; - } - } - } - - } - - return 1; -} - -int vg_set_max_lv(struct volume_group *vg, uint32_t max_lv) -{ - if (!vg_is_resizeable(vg)) { - log_error("Volume group \"%s\" must be resizeable " - "to change MaxLogicalVolume", vg->name); - return 0; - } - - if (!(vg->fid->fmt->features & FMT_UNLIMITED_VOLS)) { - if (!max_lv) - max_lv = 255; - else if (max_lv > 255) { - log_error("MaxLogicalVolume limit is 255"); - return 0; - } - } - - if (max_lv && max_lv < vg_visible_lvs(vg)) { - log_error("MaxLogicalVolume is less than the current number " - "%d of LVs for %s", vg_visible_lvs(vg), - vg->name); - return 0; - } - vg->max_lv = max_lv; - - return 1; -} - -int vg_set_max_pv(struct volume_group *vg, uint32_t max_pv) -{ - if (!vg_is_resizeable(vg)) { - log_error("Volume group \"%s\" must be resizeable " - "to change MaxPhysicalVolumes", vg->name); - return 0; - } - - if (!(vg->fid->fmt->features & FMT_UNLIMITED_VOLS)) { - if (!max_pv) - max_pv = 255; - else if (max_pv > 255) { - log_error("MaxPhysicalVolume limit is 255"); - return 0; - } - } - - if (max_pv && max_pv < vg->pv_count) { - log_error("MaxPhysicalVolumes is less than the current number " - "%d of PVs for \"%s\"", vg->pv_count, - vg->name); - return 0; - } - vg->max_pv = max_pv; - return 1; -} - -int vg_set_alloc_policy(struct volume_group *vg, alloc_policy_t alloc) -{ - if (alloc == ALLOC_INHERIT) { - log_error("Volume Group allocation policy cannot inherit " - "from anything"); - return 0; - } - - if (alloc == vg->alloc) - return 1; - - vg->alloc = alloc; - return 1; -} - -int vg_set_clustered(struct volume_group *vg, int clustered) -{ - struct lv_list *lvl; - - /* - * We do not currently support switching the cluster attribute - * on active mirrors or snapshots. - */ - dm_list_iterate_items(lvl, &vg->lvs) { - if (lv_is_mirrored(lvl->lv) && lv_is_active(lvl->lv)) { - log_error("Mirror logical volumes must be inactive " - "when changing the cluster attribute."); - return 0; - } - - if (clustered) { - 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); - return 0; - } - } - - if ((lv_is_origin(lvl->lv) || lv_is_cow(lvl->lv)) && - lv_is_active(lvl->lv)) { - log_error("Snapshot logical volumes must be inactive " - "when changing the cluster attribute."); - return 0; - } - } - - if (clustered) - vg->status |= CLUSTERED; - else - vg->status &= ~CLUSTERED; - return 1; -} - static int _move_mdas(struct volume_group *vg_from, struct volume_group *vg_to, struct dm_list *mdas_from, struct dm_list *mdas_to) { @@ -2168,31 +1848,6 @@ return 1; } -unsigned snapshot_count(const struct volume_group *vg) -{ - struct lv_list *lvl; - unsigned num_snapshots = 0; - - dm_list_iterate_items(lvl, &vg->lvs) - if (lv_is_cow(lvl->lv)) - num_snapshots++; - - return num_snapshots; -} - -unsigned vg_visible_lvs(const struct volume_group *vg) -{ - struct lv_list *lvl; - unsigned lv_count = 0; - - dm_list_iterate_items(lvl, &vg->lvs) { - if (lv_is_visible(lvl->lv)) - lv_count++; - } - - return lv_count; -} - /* * Determine whether two vgs are compatible for merging. */ @@ -4472,79 +4127,6 @@ return 1; } -uint32_t vg_seqno(const struct volume_group *vg) -{ - return vg->seqno; -} - -uint64_t vg_status(const struct volume_group *vg) -{ - return vg->status; -} - -uint64_t vg_size(const struct volume_group *vg) -{ - return (uint64_t) vg->extent_count * vg->extent_size; -} - -uint64_t vg_free(const struct volume_group *vg) -{ - return (uint64_t) vg->free_count * vg->extent_size; -} - -uint64_t vg_extent_size(const struct volume_group *vg) -{ - return (uint64_t) vg->extent_size; -} - -uint64_t vg_extent_count(const struct volume_group *vg) -{ - return (uint64_t) vg->extent_count; -} - -uint64_t vg_free_count(const struct volume_group *vg) -{ - return (uint64_t) vg->free_count; -} - -uint64_t vg_pv_count(const struct volume_group *vg) -{ - return (uint64_t) vg->pv_count; -} - -uint64_t vg_max_pv(const struct volume_group *vg) -{ - return (uint64_t) vg->max_pv; -} - -uint64_t vg_max_lv(const struct volume_group *vg) -{ - return (uint64_t) vg->max_lv; -} - -uint32_t vg_mda_count(const struct volume_group *vg) -{ - return dm_list_size(&vg->fid->metadata_areas_in_use) + - dm_list_size(&vg->fid->metadata_areas_ignored); -} - -uint32_t vg_mda_used_count(const struct volume_group *vg) -{ - uint32_t used_count = 0; - struct metadata_area *mda; - - /* - * Ignored mdas could be on either list - the reason being the state - * may have changed from ignored to un-ignored and we need to write - * the state to disk. - */ - dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) - if (!mda_is_ignored(mda)) - used_count++; - - return used_count; -} - uint64_t lv_size(const struct logical_volume *lv) { return lv->size; --- LVM2/lib/metadata/metadata.h 2010/08/26 12:08:19 1.218 +++ LVM2/lib/metadata/metadata.h 2010/09/30 13:04:56 1.219 @@ -378,11 +378,6 @@ struct lv_segment *get_only_segment_using_this_lv(struct logical_volume *lv); /* - * Count snapshot LVs. - */ -unsigned snapshot_count(const struct volume_group *vg); - -/* * Calculate readahead from underlying PV devices */ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahead); @@ -417,7 +412,5 @@ int is_mirror_image_removable(struct logical_volume *mimage_lv, void *baton); uint64_t find_min_mda_size(struct dm_list *mdas); -uint64_t vg_mda_size(const struct volume_group *vg); -uint64_t vg_mda_free(const struct volume_group *vg); #endif