diff options
author | Alasdair Kergon <agk@redhat.com> | 2008-01-30 14:00:02 +0000 |
---|---|---|
committer | Alasdair Kergon <agk@redhat.com> | 2008-01-30 14:00:02 +0000 |
commit | 67cdbd7e4dc4fcd08c54de6e2c943d059df14147 (patch) | |
tree | 2dde8ace94d9730fe88be445487f2a6efb6f0786 /lib/format1 | |
parent | c51b9fff19d4891addf22f35950eeae48be9cac8 (diff) | |
download | lvm2-67cdbd7e4dc4fcd08c54de6e2c943d059df14147.tar.gz lvm2-67cdbd7e4dc4fcd08c54de6e2c943d059df14147.tar.xz lvm2-67cdbd7e4dc4fcd08c54de6e2c943d059df14147.zip |
Some whitespace tidy-ups.
Diffstat (limited to 'lib/format1')
-rw-r--r-- | lib/format1/disk-rep.c | 28 | ||||
-rw-r--r-- | lib/format1/format1.c | 4 | ||||
-rw-r--r-- | lib/format1/import-export.c | 4 | ||||
-rw-r--r-- | lib/format1/import-extents.c | 4 | ||||
-rw-r--r-- | lib/format1/layout.c | 2 | ||||
-rw-r--r-- | lib/format1/lvm1-label.c | 2 | ||||
-rw-r--r-- | lib/format1/vg_number.c | 2 |
7 files changed, 23 insertions, 23 deletions
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. |