From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4884 invoked by alias); 19 Nov 2009 12:13:39 -0000 Received: (qmail 4870 invoked by uid 9699); 19 Nov 2009 12:13:39 -0000 Date: Thu, 19 Nov 2009 12:13:00 -0000 Message-ID: <20091119121339.4868.qmail@sourceware.org> From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 daemons/clvmd/lvm-functions.c lib/metadat ... 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: 2009-11/txt/msg00028.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2009-11-19 12:13:37 Modified files: daemons/clvmd : lvm-functions.c lib/metadata : metadata-exported.h metadata.c Log message: Un-export vg_read_internal. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=1.70&r2=1.71 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.121&r2=1.122 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.295&r2=1.296 --- LVM2/daemons/clvmd/lvm-functions.c 2009/10/22 17:45:24 1.70 +++ LVM2/daemons/clvmd/lvm-functions.c 2009/11/19 12:13:37 1.71 @@ -774,15 +774,14 @@ void lvm_do_backup(const char *vgname) { struct volume_group * vg; - int consistent = 0; DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended); pthread_mutex_lock(&lvm_lock); - vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, &consistent); + vg = vg_read(cmd, vgname, NULL /*vgid*/, 0 /*flags*/); - if (vg && consistent) + if (!vg_read_error(vg)) check_current_backup(vg); else log_error("Error backing up metadata, can't find VG for group %s", vgname); --- LVM2/lib/metadata/metadata-exported.h 2009/11/01 20:05:17 1.121 +++ LVM2/lib/metadata/metadata-exported.h 2009/11/19 12:13:37 1.122 @@ -380,8 +380,6 @@ int vg_write(struct volume_group *vg); int vg_commit(struct volume_group *vg); int vg_revert(struct volume_group *vg); -struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name, - const char *vgid, int *consistent); struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name, struct dm_list *mdas, uint64_t *label_sector, int warnings, int scan_label_only); @@ -472,7 +470,7 @@ force_t force); /* * vg_release() must be called on every struct volume_group allocated - * by vg_create() or vg_read_internal() to free it when no longer required. + * by vg_create() or vg_read() to free it when no longer required. */ void vg_release(struct volume_group *vg); --- LVM2/lib/metadata/metadata.c 2009/11/01 20:05:17 1.295 +++ LVM2/lib/metadata/metadata.c 2009/11/19 12:13:37 1.296 @@ -58,6 +58,10 @@ static uint32_t _vg_bad_status_bits(const struct volume_group *vg, uint32_t status); +static struct volume_group *_vg_read_internal(struct cmd_context *cmd, + const char *vgname, + const char *vgid, int *consistent); + const char _really_init[] = "Really INITIALIZE physical volume \"%s\" of volume group \"%s\" [y/n]? "; @@ -284,7 +288,7 @@ struct pv_list *pvl; int r = 0, consistent = 0; - if (!(vg = vg_read_internal(fmt->cmd, vg_name, vgid, &consistent))) { + if (!(vg = _vg_read_internal(fmt->cmd, vg_name, vgid, &consistent))) { log_error("get_pv_from_vg_by_id: vg_read_internal failed to read VG %s", vg_name); return 0; @@ -786,10 +790,10 @@ /* NOTE: let caller decide - this may be check for existence */ return _vg_make_handle(cmd, NULL, rc); - /* FIXME: Is this vg_read_internal necessary? Move it inside + /* FIXME: Is this _vg_read_internal necessary? Move it inside vg_lock_newname? */ /* is this vg name already in use ? */ - if ((vg = vg_read_internal(cmd, vg_name, NULL, &consistent))) { + if ((vg = _vg_read_internal(cmd, vg_name, NULL, &consistent))) { log_error("A volume group called '%s' already exists.", vg_name); unlock_and_release_vg(cmd, vg, vg_name); return _vg_make_handle(cmd, NULL, FAILED_EXIST); @@ -2490,7 +2494,7 @@ if (is_orphan_vg(vgname)) { if (use_precommitted) { - log_error("Internal error: vg_read_internal requires vgname " + log_error("Internal error: _vg_read requires vgname " "with pre-commit."); return NULL; } @@ -2779,8 +2783,9 @@ return correct_vg; } -struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgname, - const char *vgid, int *consistent) +static struct volume_group *_vg_read_internal(struct cmd_context *cmd, + const char *vgname, + const char *vgid, int *consistent) { struct volume_group *vg; struct lv_list *lvl; @@ -3045,7 +3050,7 @@ stack; continue; } - if (!(vg = vg_read_internal(cmd, vgname, vgid, &consistent))) { + if (!(vg = _vg_read_internal(cmd, vgname, vgid, &consistent))) { stack; continue; } @@ -3279,7 +3284,7 @@ if (!lock_vol(cmd, lock_name, lock_flags)) return_NULL; - if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent))) + if (!(vg = _vg_read_internal(cmd, vg_name, vgid, &consistent))) return_NULL; if (!consistent) { @@ -3336,7 +3341,7 @@ consistent_in = consistent; /* If consistent == 1, we get NULL here if correction fails. */ - if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent))) { + if (!(vg = _vg_read_internal(cmd, vg_name, vgid, &consistent))) { if (consistent_in && !consistent) { log_error("Volume group \"%s\" inconsistent.", vg_name); failure |= FAILED_INCONSISTENT;