search for: 150c089

...cn.fujitsu.com> > --- > daemon/btrfs.c | 32 ++++++++++++++++++++++++++++++++ > generator/actions.ml | 17 +++++++++++++++++ > src/MAX_PROC_NR | 2 +- > 3 files changed, 50 insertions(+), 1 deletion(-) > > diff --git a/daemon/btrfs.c b/daemon/btrfs.c > index 150c089..79de539 100644 > --- a/daemon/btrfs.c > +++ b/daemon/btrfs.c > @@ -1343,3 +1343,35 @@ do_btrfs_qgroup_remove (const char *src, const char *dst, const char *path) > > return 0; > } > + > +int > +do_btrfs_scrub (const char *path) > +{ > + const size_t MAX_ARGS...

...do_vfs_type (mountable); + + if (type && STREQ (type, "btrfs") && optgroup_btrfs_available ()) + return btrfs_get_label (mountable->device); + return get_blkid_tag (mountable->device, "LABEL"); } diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 150c089..cf1507d 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -44,6 +44,30 @@ optgroup_btrfs_available (void) return prog_exists (str_btrfs) && filesystem_available ("btrfs") > 0; } +char * +btrfs_get_label (const char *device) +{ + int r; + CLEANUP_FREE char *err = NULL...

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- daemon/btrfs.c | 32 ++++++++++++++++++++++++++++++++ generator/actions.ml | 17 +++++++++++++++++ src/MAX_PROC_NR | 2 +- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 150c089..79de539 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -1343,3 +1343,35 @@ do_btrfs_qgroup_remove (const char *src, const char *dst, const char *path) return 0; } + +int +do_btrfs_scrub (const char *path) +{ + const size_t MAX_ARGS = 64; + const char *argv[MAX_ARGS]; + size_t i = 0;...

...t; daemon/btrfs.c | 32 ++++++++++++++++++++++++++++++++ > > generator/actions.ml | 17 +++++++++++++++++ > > src/MAX_PROC_NR | 2 +- > > 3 files changed, 50 insertions(+), 1 deletion(-) > > > > diff --git a/daemon/btrfs.c b/daemon/btrfs.c > > index 150c089..79de539 100644 > > --- a/daemon/btrfs.c > > +++ b/daemon/btrfs.c > > @@ -1343,3 +1343,35 @@ do_btrfs_qgroup_remove (const char *src, const char *dst, const char *path) > > > > return 0; > > } > > + > > +int > > +do_btrfs_scrub (const char...

...type (mountable); + + if (type) { + if (STREQ (type, "btrfs") && optgroup_btrfs_available ()) + return btrfs_get_label (mountable->device); + } + return get_blkid_tag (mountable->device, "LABEL"); } diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 150c089..cf1507d 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -44,6 +44,30 @@ optgroup_btrfs_available (void) return prog_exists (str_btrfs) && filesystem_available ("btrfs") > 0; } +char * +btrfs_get_label (const char *device) +{ + int r; + CLEANUP_FREE char *err = NULL...

Hi, There is one problem: btrfs_filesystem_set_label just doesnt work, giving error message: libguestfs: error: btrfs_filesystem_set_label: /: ERROR: unable to set label Bad address I'm almost sure the patch has no problem, but can't figure out what's the cause. So patch 5 is only for review. Other APIs have no problem. Regards, Hu Hu Tao (5): New API: btrfs_scrub New API:

Hi, This series adds new APIs to support btrfs scrub, balance, rescue and inspect. Some of them don't have tests because: - btrfs_scrub and btrfs_balance completes too early before we can test btrfs_scrub_cancel, btrfs_scrub_resume, btrfs_scrub_status, btrfs_balance_pause, btrfs_balance_cancel, btrfs_balance_resume and btrfs_balance_status. - can't