master - cleanup: drop unused header
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6ebbf1982892a8...
Commit: 6ebbf1982892a819dc14045a8dca0ad512cebdf8
Parent: 07d766d270f764e3a8300fee79ac559d18f21e66
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 10:04:13 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:56 2013 +0100
cleanup: drop unused header
Header is not used here.
---
liblvm/lvm_base.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c
index d694173..80a4894 100644
--- a/liblvm/lvm_base.c
+++ b/liblvm/lvm_base.c
@@ -18,7 +18,6 @@
#include "lvm-version.h"
#include "metadata-exported.h"
#include "lvm2app.h"
-#include "lvm-string.h"
const char *lvm_library_get_version(void)
{
10 years, 5 months
master - cleanup: use string directly
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=07d766d270f764...
Commit: 07d766d270f764e3a8300fee79ac559d18f21e66
Parent: 3e0fb102dece1a4d476496c3b6291e319b6305be
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:24:53 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
cleanup: use string directly
---
lib/misc/lvm-wrappers.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c
index a96cd98..46590b9 100644
--- a/lib/misc/lvm-wrappers.c
+++ b/lib/misc/lvm-wrappers.c
@@ -18,7 +18,6 @@
#include <fcntl.h>
#ifdef UDEV_SYNC_SUPPORT
-static const char _no_context_msg[] = "Udev library context not set.";
struct udev *_udev;
int udev_init_library_context(void)
@@ -46,7 +45,7 @@ int udev_is_running(void)
int r;
if (!_udev) {
- log_debug_activation(_no_context_msg);
+ log_debug_activation("Udev library context not set.");
goto bad;
}
10 years, 5 months
master - cleanup: simplify pv uuid display
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3e0fb102dece1a...
Commit: 3e0fb102dece1a4d476496c3b6291e319b6305be
Parent: bea118a87cd6cf7c63ccaa0d75691de1f73602ab
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:23:31 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
cleanup: simplify pv uuid display
Shorter code with explicit type casting.
---
lib/report/report.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/lib/report/report.c b/lib/report/report.c
index 20eab4f..2d39cb0 100644
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -728,18 +728,13 @@ static int _pvuuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_
const void *data, void *private __attribute__((unused)))
{
const struct label *label = (const struct label *) data;
- char *repstr = NULL;
+ const char *repstr = "";
- if (!label->dev)
- dm_report_field_set_value(field, "", NULL);
- else {
- if (!(repstr = id_format_and_copy(mem, label->dev->pvid)))
- return_0;
-
- dm_report_field_set_value(field, repstr, NULL);
- }
+ if (label->dev &&
+ !(repstr = id_format_and_copy(mem, (const struct id *) label->dev->pvid)))
+ return_0;
- return 1;
+ return _field_set_value(field, repstr, NULL);
}
static int _pvmdas_disp(struct dm_report *rh, struct dm_pool *mem,
10 years, 5 months
master - cleanup: use safe iterator
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bea118a87cd6cf...
Commit: bea118a87cd6cf7c63ccaa0d75691de1f73602ab
Parent: 19cc92230cd855d08e0a8787687c8dba9cd8d627
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:18:02 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
cleanup: use safe iterator
Simplify code and use dm_list_iterate_items_safe() and avoid
scanning the list mutliple times.
Use dm_list_move().
---
lib/metadata/metadata.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 53d7e5e..c71ec30 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -2809,7 +2809,7 @@ static struct volume_group *_vg_read_orphans(struct cmd_context *cmd,
struct lvmcache_vginfo *vginfo;
struct volume_group *vg = NULL;
struct _vg_read_orphan_baton baton;
- struct pv_list *pvl, *pvl_;
+ struct pv_list *pvl, *tpvl;
struct pv_list head;
dm_list_init(&head.list);
@@ -2823,15 +2823,13 @@ static struct volume_group *_vg_read_orphans(struct cmd_context *cmd,
return_NULL;
vg = fmt->orphan_vg;
-restart:
- dm_list_iterate_items(pvl, &vg->pvs) {
- if (pvl->pv->status & UNLABELLED_PV ) {
- dm_list_del(&pvl->list);
- dm_list_add(&head.list, &pvl->list);
- goto restart;
- } else
+
+ dm_list_iterate_items_safe(pvl, tpvl, &vg->pvs)
+ if (pvl->pv->status & UNLABELLED_PV )
+ dm_list_move(&head.list, &pvl->list);
+ else
pv_set_fid(pvl->pv, NULL);
- }
+
dm_list_init(&vg->pvs);
vg->pv_count = 0;
vg->extent_count = 0;
10 years, 5 months
master - cleanup: use trigraph
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=19cc92230cd855...
Commit: 19cc92230cd855d08e0a8787687c8dba9cd8d627
Parent: 879ea38c53f81ab22225fb368e8787144517d963
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:15:47 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
cleanup: use trigraph
Shorter code...
---
lib/metadata/lv_manip.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index e22aaa2..491accd 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -3822,10 +3822,8 @@ static int _lvresize_adjust_extents(struct cmd_context *cmd, struct logical_volu
lv->status |= LV_NOTSYNCED;
dm_list_iterate_back_items(mirr_seg, &lv->segments) {
- if (seg_is_mirrored(mirr_seg))
- seg_mirrors = lv_mirror_count(mirr_seg->lv);
- else
- seg_mirrors = 0;
+ seg_mirrors = seg_is_mirrored(mirr_seg) ?
+ lv_mirror_count(mirr_seg->lv) : 0;
break;
}
10 years, 5 months
master - dmeventd: drop duplicated code
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=879ea38c53f81a...
Commit: 879ea38c53f81ab22225fb368e8787144517d963
Parent: 1ff53bb7b682a13e32d986e53a40eeb8fb5e47c4
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 10:01:52 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
dmeventd: drop duplicated code
Do not call pthread_attr_init() twice.
The second call has all proper tests.
---
daemons/dmeventd/dmeventd.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index e9fc59b..189d1b6 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -273,7 +273,6 @@ static int _pthread_create_smallstack(pthread_t *t, void *(*fun)(void *), void *
int r;
pthread_t tmp;
pthread_attr_t attr;
- pthread_attr_init(&attr);
/*
* From pthread_attr_init man page:
10 years, 5 months
master - snapshot: code move
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1ff53bb7b682a1...
Commit: 1ff53bb7b682a13e32d986e53a40eeb8fb5e47c4
Parent: 30c127eaf8561c9fc4b0aecace2991d3551a5dd3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 18:19:13 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
snapshot: code move
Move some code lines in front, they will be shared with thin snapshot
merge later.
---
lib/metadata/snapshot_manip.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index c491918..3e90f3e 100644
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -154,6 +154,10 @@ void init_snapshot_seg(struct lv_segment *seg, struct logical_volume *origin,
void init_snapshot_merge(struct lv_segment *snap_seg,
struct logical_volume *origin)
{
+ snap_seg->status |= MERGING;
+ origin->snapshot = snap_seg;
+ origin->status |= MERGING;
+
/*
* Even though lv_is_visible(snap_seg->lv) returns 0,
* the snap_seg->lv (name: snapshotX) is _not_ hidden;
@@ -165,9 +169,6 @@ void init_snapshot_merge(struct lv_segment *snap_seg,
* merge metadata (snap_seg->lv is now "internal")
*/
snap_seg->lv->status &= ~VISIBLE_LV;
- snap_seg->status |= MERGING;
- origin->snapshot = snap_seg;
- origin->status |= MERGING;
}
void clear_snapshot_merge(struct logical_volume *origin)
10 years, 5 months
master - fix missing header
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=30c127eaf8561c...
Commit: 30c127eaf8561c9fc4b0aecace2991d3551a5dd3
Parent: b4fc397de6a456efb8b8cce1e7d0048d4573f7cc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 20:44:25 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
fix missing header
---
lib/metadata/pv_manip.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c
index bee7972..d0c3b44 100644
--- a/lib/metadata/pv_manip.c
+++ b/lib/metadata/pv_manip.c
@@ -19,6 +19,7 @@
#include "toolcontext.h"
#include "locking.h"
#include "defaults.h"
+#include "lvmcache.h"
#include "lvmetad.h"
#include "display.h"
#include "label.h"
10 years, 5 months
master - do_flock: mark descriptor as closed
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b4fc397de6a456...
Commit: b4fc397de6a456efb8b8cce1e7d0048d4573f7cc
Parent: 782a356e7cce8d0d32850677cdb5a9b28996471e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:16:12 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:55 2013 +0100
do_flock: mark descriptor as closed
Keep the structure content valid in error path
and mark descriptor as closed (-1).
---
lib/locking/file_locking.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c
index ab3dabd..3fa0a2d 100644
--- a/lib/locking/file_locking.c
+++ b/lib/locking/file_locking.c
@@ -163,6 +163,7 @@ static int _do_flock(const char *file, int *fd, int operation, uint32_t nonblock
log_sys_error("flock", file);
if (close(*fd))
log_sys_error("close", file);
+ *fd = -1;
return 0;
}
10 years, 5 months
master - archiver: add check for dm_pool_strdup
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=782a356e7cce8d...
Commit: 782a356e7cce8d0d32850677cdb5a9b28996471e
Parent: d079c81ab49648fc5506490e34e16244c20fa45f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Nov 22 13:12:35 2013 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Nov 22 21:00:54 2013 +0100
archiver: add check for dm_pool_strdup
It will likely not fail to duplicate empty string, but
just keep the test of result of this function consistent.
Also on error path restore extent_size if in some
case someone would still use that variable.
---
lib/format_text/archiver.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index f41bffc..c1fe3f5 100644
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -334,13 +334,17 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg, int drop
* Setting vg->old_name to a blank value will explicitly
* disable any attempt to check VG name in existing metadata.
*/
- vg->old_name = dm_pool_strdup(vg->vgmem, "");
+ if (!(vg->old_name = dm_pool_strdup(vg->vgmem, ""))) {
+ log_error("Failed to duplicate empty name.");
+ return 0;
+ }
/* Add any metadata areas on the PVs */
dm_list_iterate_items(pvl, &vg->pvs) {
tmp = vg->extent_size;
vg->extent_size = 0;
if (!vg->fid->fmt->ops->pv_setup(vg->fid->fmt, pvl->pv, vg)) {
+ vg->extent_size = tmp;
log_error("Format-specific setup for %s failed",
pv_dev_name(pvl->pv));
return 0;
10 years, 5 months