search for: 2b61357

...rows an error. Here we workaround it by taking Mountable instead of Device and returning 'false' for non-device mountables. --- daemon/lvm.c | 6 ++++-- generator/actions.ml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/daemon/lvm.c b/daemon/lvm.c index 2b61357..4f02206 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -863,9 +863,11 @@ lv_canonical (const char *device, char **ret) /* Test if a device is a logical volume (RHBZ#619793). */ int -do_is_lv (const char *device) +do_is_lv (const mountable_t *mountable) { - return lv_canonical (device, NULL);...

sparsify case: modified guestfs_is_lv mllib: fixed is_btrfs_subvolume Maxim Perevedentsev (3): mllib: add checking for btrfs subvolume lvm: modify guestfs_is_lv to take mountable sysprep: fix btrfs subvolume processing in fs-uuids daemon/lvm.c | 6 ++++-- generator/actions.ml | 6 +++--- mllib/common_utils.ml | 7 +++++++

...+ return NULL; if (end_stringsbuf (&ret) == -1) - goto error; + return NULL; - return ret.argv; - - error: - if (ret.argv) - free_stringslen (ret.argv, ret.size); - return NULL; + return take_stringsbuf (&ret); } int diff --git a/daemon/lvm.c b/daemon/lvm.c index 2b61357..093e682 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -48,7 +48,7 @@ static char ** convert_lvm_output (char *out, const char *prefix) { char *p, *pend; - DECLARE_STRINGSBUF (ret); + CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret); size_t len; char buf[256]; char *str; @@ -100,7...

If add_string_nodup fails free the passed string instead of leaking it, as that string would have been owned by the stringbuf. Adapt few places to this behaviour. --- daemon/btrfs.c | 4 +--- daemon/devsparts.c | 8 ++++---- daemon/guestfsd.c | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 9b52aa8..d70565a 100644 ---

Various changes/fixes to use smaller stack frames. Rich.

..."/dev/mapper/%s", mapname) == -1) { + reply_with_perror ("asprintf"); + return -1; + } if (access (devmapper, F_OK) == 0) { reply_with_error ("%s: device already exists", devmapper); return -1; diff --git a/daemon/lvm.c b/daemon/lvm.c index 529e20d..2b61357 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -901,6 +901,8 @@ do_list_dm_devices (void) } while (1) { + CLEANUP_FREE char *devname = NULL; + errno = 0; d = readdir (dir); if (d == NULL) break; @@ -913,10 +915,12 @@ do_list_dm_devices (void) if (STREQ (d->d_name,...