search for: 98e74c7

...mes of a btrfs filesystem, ignore the default subvolume: we get the content of it when mounting the whole device (without specifying any particular subvolume), so avoid listing it twice. --- src/listfs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/listfs.c b/src/listfs.c index 98e74c7..de3b6f5 100644 --- a/src/listfs.c +++ b/src/listfs.c @@ -169,8 +169,17 @@ check_with_vfs_type (guestfs_h *g, const char *device, struct stringsbuf *sb) if (vols == NULL) return -1; + int64_t default_volume = guestfs_btrfs_subvolume_get_default (g, device); + for (size_t i = 0...

...t when mounting the whole device > > (without specifying any particular subvolume), so avoid listing it > > twice. > > --- > > src/listfs.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/src/listfs.c b/src/listfs.c > > index 98e74c7..de3b6f5 100644 > > --- a/src/listfs.c > > +++ b/src/listfs.c > > @@ -169,8 +169,17 @@ check_with_vfs_type (guestfs_h *g, const char > > *device, struct stringsbuf *sb) > > if (vols == NULL) > > return -1; > > > > + int64_t default_vo...

...> subvolume: we get the content of it when mounting the whole device > (without specifying any particular subvolume), so avoid listing it > twice. > --- > src/listfs.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/src/listfs.c b/src/listfs.c > index 98e74c7..de3b6f5 100644 > --- a/src/listfs.c > +++ b/src/listfs.c > @@ -169,8 +169,17 @@ check_with_vfs_type (guestfs_h *g, const char *device, struct stringsbuf *sb) > if (vols == NULL) > return -1; > > + int64_t default_volume = guestfs_btrfs_subvolume_get_default (g...

...c @@ -63,7 +63,7 @@ main (int argc, char *argv[]) exit (EXIT_FAILURE); return ver >= (major * 1000000 + minor * 1000 + release) - ? EXIT_SUCCESS : EXIT_FAILURE; + ? EXIT_SUCCESS : EXIT_FAILURE; } static unsigned int diff --git a/src/listfs.c b/src/listfs.c index 046cd4e..98e74c7 100644 --- a/src/listfs.c +++ b/src/listfs.c @@ -172,8 +172,8 @@ check_with_vfs_type (guestfs_h *g, const char *device, struct stringsbuf *sb) for (size_t i = 0; i < vols->len; i++) { struct guestfs_btrfssubvolume *this = &vols->val[i]; guestfs_int_add_sprintf (g, sb...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67