shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Use vg_is_exported(vg) macro everywhere.

Browse Source 
This patch is all just cleanup and no other patch depends on it.
Replace explicit dereference and check with vg_is_exported().
Update a few copyrights and remove unnecessary whitespace.
Should be no functional change.
This commit is contained in:
Dave Wysochanski 2009-09-14 19:44:15 +00:00
parent dd8ef51fa1
commit 1b3f8a4c18
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cache/lvmcache.c vendored
View File

@ -821,7 +821,7 @@ static int _insert_vginfo(struct lvmcache_vginfo *new_vginfo, const char *vgid,
char uuid_primary[64] __attribute((aligned(8)));
char uuid_new[64] __attribute((aligned(8)));
int use_new = 0;
/* Pre-existing VG takes precedence. Unexported VG takes precedence. */
if (primary_vginfo) {
if (!id_write_format((const struct id *)vgid, uuid_new, sizeof(uuid_new)))

2
lib/display/display.c
View File

@ -597,7 +597,7 @@ void vgdisplay_full(const struct volume_group *vg)
access_str == LVM_WRITE ? "write" : "",
access_str == 0 ? "error" : "");
log_print("VG Status %s%sresizable",
vg->status & EXPORTED_VG ? "exported/" : "",
vg_is_exported(vg) ? "exported/" : "",
vg->status & RESIZEABLE_VG ? "" : "NOT ");
/* vg number not part of LVM2 design
log_print ("VG # %u\n", vg->vg_number);

6
lib/format1/import-export.c
View File

@ -160,7 +160,7 @@ int export_pv(struct cmd_context *cmd, struct dm_pool *mem __attribute((unused))
strncpy((char *)pvd->system_id, vg->system_id, sizeof(pvd->system_id));
/* Is VG already exported or being exported? */
if (vg && (vg->status & EXPORTED_VG)) {
if (vg && vg_is_exported(vg)) {
/* Does system_id need setting? */
if (!*vg->system_id ||
strncmp(vg->system_id, EXPORTED_TAG,
@ -178,7 +178,7 @@ int export_pv(struct cmd_context *cmd, struct dm_pool *mem __attribute((unused))
}
/* Is VG being imported? */
if (vg && !(vg->status & EXPORTED_VG) && *vg->system_id &&
if (vg && !vg_is_exported(vg) && *vg->system_id &&
!strncmp(vg->system_id, EXPORTED_TAG, sizeof(EXPORTED_TAG) - 1)) {
if (!_system_id(cmd, (char *)pvd->system_id, IMPORTED_TAG))
return_0;
@ -275,7 +275,7 @@ int export_vg(struct vg_disk *vgd, struct volume_group *vg)
if (vg->status & SHARED)
vgd->vg_access |= VG_SHARED;
if (vg->status & EXPORTED_VG)
if (vg_is_exported(vg))
vgd->vg_status |= VG_EXPORTED;
if (vg->status & RESIZEABLE_VG)

2
lib/format_text/archiver.c
View File

@ -415,7 +415,7 @@ void check_current_backup(struct volume_group *vg)
struct volume_group *vg_backup;
int old_suppress;
if (vg->status & EXPORTED_VG)
if (vg_is_exported(vg))
return;
if (dm_snprintf(path, sizeof(path), "%s/%s",

2
lib/report/report.c
View File

@ -434,7 +434,7 @@ static int _vgstatus_disp(struct dm_report *rh __attribute((unused)), struct dm_
else
repstr[1] = '-';
if (vg->status & EXPORTED_VG)
if (vg_is_exported(vg))
repstr[2] = 'x';
else
repstr[2] = '-';

4
tools/vgchange.c
View File

@ -446,7 +446,7 @@ static int _vgchange_refresh(struct cmd_context *cmd, struct volume_group *vg)
if (!vg_refresh_visible(cmd, vg))
return ECMD_FAILED;
return ECMD_PROCESSED;
}
@ -459,7 +459,7 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
if (vg_read_error(vg))
return ECMD_FAILED;
if (vg_status(vg) & EXPORTED_VG) {
if (vg_is_exported(vg)) {
log_error("Volume group \"%s\" is exported", vg_name);
return ECMD_FAILED;
}

4
tools/vgimport.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
* Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
* Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@ -26,7 +26,7 @@ static int vgimport_single(struct cmd_context *cmd __attribute((unused)),
if (vg_read_error(vg))
goto error;
if (!(vg_status(vg) & EXPORTED_VG)) {
if (!vg_is_exported(vg)) {
log_error("Volume group \"%s\" is not exported", vg_name);
goto error;
}

4
tools/vgscan.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
* Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
* Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@ -23,7 +23,7 @@ static int vgscan_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED;
log_print("Found %svolume group \"%s\" using metadata type %s",
(vg_status(vg) & EXPORTED_VG) ? "exported " : "", vg_name,
vg_is_exported(vg) ? "exported " : "", vg_name,
vg->fid->fmt->name);
check_current_backup(vg);