Displaying 3 results from an estimated 3 matches for "95a65ae".
2016 Jun 22
1
[PATCH] ext: change e2fsck retcode processing during resize
...treat it as success in normal e2fsck, but fail if e2fsck
is run by resize2fs.
Change 'manual' execution of e2fsck to dedicated function call.
---
daemon/ext2.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c
index 5dd67c7..95a65ae 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -192,24 +192,18 @@ do_get_e2uuid (const char *device)
static int
if_not_mounted_run_e2fsck (const char *device)
{
- CLEANUP_FREE char *err = NULL;
- int r, mounted;
+ int r = 0, mounted;
mounted = is_device_mounted (device);
if (mounte...
2016 Jul 07
0
[PATCH 2/2] daemon: fix cleanup of stringsbuf usages
...@@ -376,7 +364,7 @@ do_list_disk_labels (void)
if (end_stringsbuf (&ret) == -1)
goto error;
- return ret.argv; /* caller frees */
+ return take_stringsbuf (&ret); /* caller frees */
error:
if (dir)
diff --git a/daemon/ext2.c b/daemon/ext2.c
index 95a65ae..e556095 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -55,7 +55,7 @@ do_tune2fs_l (const char *device)
int r;
CLEANUP_FREE char *out = NULL, *err = NULL;
char *p, *pend, *colon;
- DECLARE_STRINGSBUF (ret);
+ CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret);
r = command (&ou...
2016 Jul 07
2
[PATCH 1/2] daemon: free the string on stringsbuf add failure
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
---