From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23698 invoked by alias); 15 Nov 2007 22:11:18 -0000 Received: (qmail 23683 invoked by uid 9447); 15 Nov 2007 22:11:18 -0000 Date: Thu, 15 Nov 2007 22:11:00 -0000 Message-ID: <20071115221118.23681.qmail@sourceware.org> From: agk@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 lib/metadata/metadata-exported.h lib/meta ... 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: 2007-11/txt/msg00027.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2007-11-15 22:11:18 Modified files: lib/metadata : metadata-exported.h pv_manip.c tools : pvresize.c Log message: move pvresize_single back under tools Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.24&r2=1.25 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/pv_manip.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/pvresize.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18 --- LVM2/lib/metadata/metadata-exported.h 2007/11/15 02:20:03 1.24 +++ LVM2/lib/metadata/metadata-exported.h 2007/11/15 22:11:18 1.25 @@ -325,10 +325,6 @@ uint64_t pvmetadatasize, struct list *mdas); int pv_resize(struct physical_volume *pv, struct volume_group *vg, uint32_t new_pe_count); -int pv_resize_single(struct cmd_context *cmd, - struct volume_group *vg, - struct physical_volume *pv, - uint64_t new_size); int pv_analyze(struct cmd_context *cmd, const char *pv_name, uint64_t label_sector); --- LVM2/lib/metadata/pv_manip.c 2007/11/02 20:40:04 1.17 +++ LVM2/lib/metadata/pv_manip.c 2007/11/15 22:11:18 1.18 @@ -439,157 +439,3 @@ else return _reduce_pv(pv, vg, new_pe_count); } - -int pv_resize_single(struct cmd_context *cmd, - struct volume_group *vg, - struct physical_volume *pv, - const uint64_t new_size) -{ - struct pv_list *pvl; - int consistent = 1; - uint64_t size = 0; - uint32_t new_pe_count = 0; - struct list mdas; - const char *pv_name = pv_dev_name(pv); - const char *vg_name; - - list_init(&mdas); - - if (is_orphan_vg(pv_vg_name(pv))) { - vg_name = VG_ORPHANS; - if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) { - log_error("Can't get lock for orphans"); - return 0; - } - - if (!(pv = pv_read(cmd, pv_name, &mdas, NULL, 1))) { - unlock_vg(cmd, vg_name); - log_error("Unable to read PV \"%s\"", pv_name); - return 0; - } - - /* FIXME Create function to test compatibility properly */ - if (list_size(&mdas) > 1) { - log_error("%s: too many metadata areas for pvresize", - pv_name); - unlock_vg(cmd, vg_name); - return 0; - } - } else { - vg_name = pv_vg_name(pv); - - if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) { - log_error("Can't get lock for %s", pv_vg_name(pv)); - return 0; - } - - if (!(vg = vg_read(cmd, vg_name, NULL, &consistent))) { - unlock_vg(cmd, vg_name); - log_error("Unable to find volume group of \"%s\"", - pv_name); - return 0; - } - - if (!vg_check_status(vg, CLUSTERED | EXPORTED_VG | LVM_WRITE)) { - unlock_vg(cmd, vg_name); - return 0; - } - - if (!(pvl = find_pv_in_vg(vg, pv_name))) { - unlock_vg(cmd, vg_name); - log_error("Unable to find \"%s\" in volume group \"%s\"", - pv_name, vg->name); - return 0; - } - - pv = pvl->pv; - - if (!archive(vg)) - return 0; - } - - if (!(pv->fmt->features & FMT_RESIZE_PV)) { - log_error("Physical volume %s format does not support resizing.", - pv_name); - unlock_vg(cmd, vg_name); - return 0; - } - - /* Get new size */ - if (!dev_get_size(pv_dev(pv), &size)) { - log_error("%s: Couldn't get size.", pv_name); - unlock_vg(cmd, vg_name); - return 0; - } - - if (new_size) { - if (new_size > size) - log_warn("WARNING: %s: Overriding real size. " - "You could lose data.", pv_name); - log_verbose("%s: Pretending size is %" PRIu64 " not %" PRIu64 - " sectors.", pv_name, new_size, pv_size(pv)); - size = new_size; - } - - if (size < PV_MIN_SIZE) { - log_error("%s: Size must exceed minimum of %ld sectors.", - pv_name, PV_MIN_SIZE); - unlock_vg(cmd, vg_name); - return 0; - } - - if (size < pv_pe_start(pv)) { - log_error("%s: Size must exceed physical extent start of " - "%" PRIu64 " sectors.", pv_name, pv_pe_start(pv)); - unlock_vg(cmd, vg_name); - return 0; - } - - pv->size = size; - - if (vg) { - pv->size -= pv_pe_start(pv); - new_pe_count = pv_size(pv) / vg->extent_size; - - if (!new_pe_count) { - log_error("%s: Size must leave space for at " - "least one physical extent of " - "%" PRIu32 " sectors.", pv_name, - pv_pe_size(pv)); - unlock_vg(cmd, vg_name); - return 0; - } - - if (!pv_resize(pv, vg, new_pe_count)) { - stack; - unlock_vg(cmd, vg_name); - return 0; - } - } - - log_verbose("Resizing volume \"%s\" to %" PRIu64 " sectors.", - pv_name, pv_size(pv)); - - log_verbose("Updating physical volume \"%s\"", pv_name); - if (!is_orphan_vg(pv_vg_name(pv))) { - if (!vg_write(vg) || !vg_commit(vg)) { - unlock_vg(cmd, pv_vg_name(pv)); - log_error("Failed to store physical volume \"%s\" in " - "volume group \"%s\"", pv_name, vg->name); - return 0; - } - backup(vg); - unlock_vg(cmd, vg_name); - } else { - if (!(pv_write(cmd, pv, NULL, INT64_C(-1)))) { - unlock_vg(cmd, VG_ORPHANS); - log_error("Failed to store physical volume \"%s\"", - pv_name); - return 0; - } - unlock_vg(cmd, vg_name); - } - - log_print("Physical volume \"%s\" changed", pv_name); - return 1; -} --- LVM2/tools/pvresize.c 2007/11/14 18:41:05 1.17 +++ LVM2/tools/pvresize.c 2007/11/15 22:11:18 1.18 @@ -23,6 +23,160 @@ unsigned total; }; +int pv_resize_single(struct cmd_context *cmd, + struct volume_group *vg, + struct physical_volume *pv, + const uint64_t new_size) +{ + struct pv_list *pvl; + int consistent = 1; + uint64_t size = 0; + uint32_t new_pe_count = 0; + struct list mdas; + const char *pv_name = pv_dev_name(pv); + const char *vg_name; + + list_init(&mdas); + + if (is_orphan_vg(pv_vg_name(pv))) { + vg_name = VG_ORPHANS; + if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) { + log_error("Can't get lock for orphans"); + return 0; + } + + if (!(pv = pv_read(cmd, pv_name, &mdas, NULL, 1))) { + unlock_vg(cmd, vg_name); + log_error("Unable to read PV \"%s\"", pv_name); + return 0; + } + + /* FIXME Create function to test compatibility properly */ + if (list_size(&mdas) > 1) { + log_error("%s: too many metadata areas for pvresize", + pv_name); + unlock_vg(cmd, vg_name); + return 0; + } + } else { + vg_name = pv_vg_name(pv); + + if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) { + log_error("Can't get lock for %s", pv_vg_name(pv)); + return 0; + } + + if (!(vg = vg_read(cmd, vg_name, NULL, &consistent))) { + unlock_vg(cmd, vg_name); + log_error("Unable to find volume group of \"%s\"", + pv_name); + return 0; + } + + if (!vg_check_status(vg, CLUSTERED | EXPORTED_VG | LVM_WRITE)) { + unlock_vg(cmd, vg_name); + return 0; + } + + if (!(pvl = find_pv_in_vg(vg, pv_name))) { + unlock_vg(cmd, vg_name); + log_error("Unable to find \"%s\" in volume group \"%s\"", + pv_name, vg->name); + return 0; + } + + pv = pvl->pv; + + if (!archive(vg)) + return 0; + } + + if (!(pv->fmt->features & FMT_RESIZE_PV)) { + log_error("Physical volume %s format does not support resizing.", + pv_name); + unlock_vg(cmd, vg_name); + return 0; + } + + /* Get new size */ + if (!dev_get_size(pv_dev(pv), &size)) { + log_error("%s: Couldn't get size.", pv_name); + unlock_vg(cmd, vg_name); + return 0; + } + + if (new_size) { + if (new_size > size) + log_warn("WARNING: %s: Overriding real size. " + "You could lose data.", pv_name); + log_verbose("%s: Pretending size is %" PRIu64 " not %" PRIu64 + " sectors.", pv_name, new_size, pv_size(pv)); + size = new_size; + } + + if (size < PV_MIN_SIZE) { + log_error("%s: Size must exceed minimum of %ld sectors.", + pv_name, PV_MIN_SIZE); + unlock_vg(cmd, vg_name); + return 0; + } + + if (size < pv_pe_start(pv)) { + log_error("%s: Size must exceed physical extent start of " + "%" PRIu64 " sectors.", pv_name, pv_pe_start(pv)); + unlock_vg(cmd, vg_name); + return 0; + } + + pv->size = size; + + if (vg) { + pv->size -= pv_pe_start(pv); + new_pe_count = pv_size(pv) / vg->extent_size; + + if (!new_pe_count) { + log_error("%s: Size must leave space for at " + "least one physical extent of " + "%" PRIu32 " sectors.", pv_name, + pv_pe_size(pv)); + unlock_vg(cmd, vg_name); + return 0; + } + + if (!pv_resize(pv, vg, new_pe_count)) { + stack; + unlock_vg(cmd, vg_name); + return 0; + } + } + + log_verbose("Resizing volume \"%s\" to %" PRIu64 " sectors.", + pv_name, pv_size(pv)); + + log_verbose("Updating physical volume \"%s\"", pv_name); + if (!is_orphan_vg(pv_vg_name(pv))) { + if (!vg_write(vg) || !vg_commit(vg)) { + unlock_vg(cmd, pv_vg_name(pv)); + log_error("Failed to store physical volume \"%s\" in " + "volume group \"%s\"", pv_name, vg->name); + return 0; + } + backup(vg); + unlock_vg(cmd, vg_name); + } else { + if (!(pv_write(cmd, pv, NULL, INT64_C(-1)))) { + unlock_vg(cmd, VG_ORPHANS); + log_error("Failed to store physical volume \"%s\"", + pv_name); + return 0; + } + unlock_vg(cmd, vg_name); + } + + log_print("Physical volume \"%s\" changed", pv_name); + return 1; +} + static int _pvresize_single(struct cmd_context *cmd, struct volume_group *vg, struct physical_volume *pv,