search for: 8ef6d5f

...() instead of commandvf() to execute e2fsck. A non-zero exit status does not always indicate a failure. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- daemon/ext2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 65ddae6..8ef6d5f 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -296,9 +296,9 @@ do_e2fsck (const char *device, ADD_ARG (argv, i, device); ADD_ARG (argv, i, NULL); - r = commandvf (NULL, &err, - COMMAND_FLAG_FOLD_STDOUT_ON_STDERR, - argv); + r = commandrvf (NULL, &am...

.../ extern char *btrfs_get_label (const char *device); extern int btrfs_set_uuid (const char *device, const char *uuid); +extern int btrfs_set_uuid_random (const char *device); /*-- in ntfs.c --*/ extern char *ntfs_get_label (const char *device); diff --git a/daemon/ext2.c b/daemon/ext2.c index 8ef6d5f..93b530b 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -159,6 +159,12 @@ do_set_e2uuid (const char *device, const char *uuid) return 0; } +int +ext_set_uuid_random (const char *device) +{ + return do_set_e2uuid (device, "random"); +} + char * do_get_e2uuid (const char *device...

...rn int swap_set_uuid (const char *device, const char *uuid); +extern int swap_set_uuid_random (const char *device); /* ordinary daemon functions use these to indicate errors * NB: you don't need to prefix the string with the current command, diff --git a/daemon/ext2.c b/daemon/ext2.c index 8ef6d5f..625e5ae 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -159,6 +159,21 @@ do_set_e2uuid (const char *device, const char *uuid) return 0; } +int +set_e2uuid_random (const char *device) +{ + int r; + CLEANUP_FREE char *err = NULL; + + r = command (NULL, &err, str_tune2fs, "-U&quo...

...rn int swap_set_uuid (const char *device, const char *uuid); +extern int swap_set_uuid_random (const char *device); /* ordinary daemon functions use these to indicate errors * NB: you don't need to prefix the string with the current command, diff --git a/daemon/ext2.c b/daemon/ext2.c index 8ef6d5f..8c8bd94 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -159,6 +159,12 @@ do_set_e2uuid (const char *device, const char *uuid) return 0; } +int +ext_set_e2uuid_random (const char *device) +{ + return do_set_e2uuid(device, "random"); +} + char * do_get_e2uuid (const char *devic...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v5: use NOT_SUPPORTED macro improve testcases v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (7):

...g */ - if (printf ("%d:%d", major (dev), minor (dev)) < 0) { + if (printf ("%ju:%ju", + (uintmax_t) major (dev), (uintmax_t) minor (dev)) < 0) { perror ("printf"); exit (EXIT_FAILURE); } diff --git a/daemon/ext2.c b/daemon/ext2.c index 8ef6d5f..9142a38 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -780,11 +780,16 @@ do_get_e2generation (const char *filename) return -1; } - if (sscanf (out, "%" SCNu64, &ret) != 1) { + if (sscanf (out, "%" SCNi64, &ret) != 1) { reply_with_error ("cannot...

...g */ - if (printf ("%d:%d", major (dev), minor (dev)) < 0) { + if (printf ("%ju:%ju", + (uintmax_t) major (dev), (uintmax_t) minor (dev)) < 0) { perror ("printf"); exit (EXIT_FAILURE); } diff --git a/daemon/ext2.c b/daemon/ext2.c index 8ef6d5f..9142a38 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -780,11 +780,16 @@ do_get_e2generation (const char *filename) return -1; } - if (sscanf (out, "%" SCNu64, &ret) != 1) { + if (sscanf (out, "%" SCNi64, &ret) != 1) { reply_with_error ("cannot...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (9): uuid: add support to change uuid of btrfs partition uuid: use existing function of