Integration branch updated

Integration branch updated

[Hugo Mills]

[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]

   I've just updated the btrfs-progs integration branch I've been
keeping. Not a huge amount new since last time:

Andreas Philipp (1):
      print parent ID in btrfs subvolume list

Goffredo Baroncelli (1):
      Scan the devices listed in /proc/partitions

Hugo Mills (1):
      mkfs.btrfs: Fix compilation errors with gcc 4.6

Zhong, Xin (1):
      btrfs-progs: Improvement for making btrfs image from source directory.

cwillu (1):
      Btrfs-progs: Correct path munging in bcp

   I've also re-worked my balance-management patches to deal with a
few oddities in the ordering of the help output, and the parameter
counts for the various balance commands.

   You can get the latest version from:

http://git.darksatanic.net/repo/btrfs-progs-unstable.git/ integration-20110626

   Hugo.

-- 
=== Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
  PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
     --- "I am the author. You are the audience. I outrank you!" ---     

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: Integration branch updated

[David Sterba]

On Sun, Jun 26, 2011 at 10:10:22PM +0100, Hugo Mills wrote:
>    I've just updated the btrfs-progs integration branch I've been
> keeping. Not a huge amount new since last time:
> 
> Andreas Philipp (1):
>       print parent ID in btrfs subvolume list

dunno if this has been mentioned already, but this change breaks
xfstests/254 and needs a patch once merged.

david

> 
> Goffredo Baroncelli (1):
>       Scan the devices listed in /proc/partitions
> 
> Hugo Mills (1):
>       mkfs.btrfs: Fix compilation errors with gcc 4.6
> 
> Zhong, Xin (1):
>       btrfs-progs: Improvement for making btrfs image from source directory.
> 
> cwillu (1):
>       Btrfs-progs: Correct path munging in bcp
> 
>    I've also re-worked my balance-management patches to deal with a
> few oddities in the ordering of the help output, and the parameter
> counts for the various balance commands.
> 
>    You can get the latest version from:
> 
> http://git.darksatanic.net/repo/btrfs-progs-unstable.git/ integration-20110626
> 
>    Hugo.
> 
> -- 
> === Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
>   PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
>      --- "I am the author. You are the audience. I outrank you!" ---     

Re: Integration branch updated

[Andreas Philipp]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
 
On 27.06.2011 14:43, David Sterba wrote:
> On Sun, Jun 26, 2011 at 10:10:22PM +0100, Hugo Mills wrote:
>> I've just updated the btrfs-progs integration branch I've been
>> keeping. Not a huge amount new since last time:
>>
>> Andreas Philipp (1):
>> print parent ID in btrfs subvolume list
>
> dunno if this has been mentioned already, but this change breaks
> xfstests/254 and needs a patch once merged.
Sorry, I was not aware of the problem with xfstests/254. But as far as
I see, xfstests/254 tests explicitly for subvolume/snapshot features
in btrfs and uses a specific filter to parse the output of btrfs
subvolume list. If this output changes (without introducing another
error), then "only" the test is broken.
Any suggestions on how to change the patch? Maybe adding a flag (-p ?)
to add the parent ID in the output and leave the standard output
untouched?

As mentioned in my original mail this patch is based on Hugos
integration branch integration-20110611.

Andreas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
iQIcBAEBAgAGBQJOCH+hAAoJEJIcBJ3+Xkgix4wQAKChVr6FITZedfI5s1/BE/gD
PRV8vjsYZQtUwNTQnUN1x+IEAgwpxmwOmBcQdOZ69zrxJlaozbu3fEn+EtDDdmBl
UcKRyCAEG2CP7lxGi6cerCq7e1m9EIw2wAd5ImnJZcUKUEOu/8oIeB2PPC1Z6J1s
edzgXzndk01LoxTBn6CiCX3CfMsWhr1h8RrVolWz0sEXUe8tw4cZT88Pd2IHSK1i
wvI3rXDAV7dTna4B9HOD9Uw1SqUfnIPOyGLs8JSguT8cJ74Z9bOP46gS4QX+yfDA
oPOj9LYBT4CyU06I/nYeL0BJkQPPtMa9KfTqE7UAgK0whPpG+MIaKkh4XXxaqDyC
IMn/rXVOpRDhe1CBOJvyUuGhJafkEQgP4RmvxWrA5ev6bL4nzvToK3FWmgEqx3Ki
ZuXEJ+05AVTlsFI5D+LtQSTI/xVq8xkJRSNFKGDuffKcm5/iWAO7M/qG1shg10c8
8p3WHGKr+vhuxNoK6DpeYYaAQYafXo2ijlmnE/8vecAFQCtxifpkshHJLPe+hB0Q
YDG2AKBsWhxFbPSfgSQdjlFiZrGR3FqVaivYWdy4d+nHI1M6dYVFHI0WCzY4fbjS
na74iuWsZfV209HasTk9wUSebYWJPn5YhmL7wWnD9auEI0G+nz+H9XeS2sAb66gX
4VF7Aa7Xdw1/PM4u/vgw
=RrQF
-----END PGP SIGNATURE-----

Re: Integration branch updated

[Hugo Mills]

[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]

On Mon, Jun 27, 2011 at 03:03:30PM +0200, Andreas Philipp wrote:
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>  
> On 27.06.2011 14:43, David Sterba wrote:
> > On Sun, Jun 26, 2011 at 10:10:22PM +0100, Hugo Mills wrote:
> >> I've just updated the btrfs-progs integration branch I've been
> >> keeping. Not a huge amount new since last time:
> >>
> >> Andreas Philipp (1):
> >> print parent ID in btrfs subvolume list
> >
> > dunno if this has been mentioned already, but this change breaks
> > xfstests/254 and needs a patch once merged.
> Sorry, I was not aware of the problem with xfstests/254. But as far as

   I've not seen anything to that effect reported. I haven't been
running xfstests regularly, though...

> I see, xfstests/254 tests explicitly for subvolume/snapshot features
> in btrfs and uses a specific filter to parse the output of btrfs
> subvolume list. If this output changes (without introducing another
> error), then "only" the test is broken.
> Any suggestions on how to change the patch? Maybe adding a flag (-p ?)
> to add the parent ID in the output and leave the standard output
> untouched?

   That has the benefit of not breaking existing code that attempts to
parse it. Anything else is going to need xfstests/254 (and any other
users of the interface) to work out which version it's trying to parse
and dealing with it appropriately.

   Hugo.

-- 
=== Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
  PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
      --- If it's December 1941 in Casablanca,  what time is it ---      
                              in New York?                               

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

[PATCH v2] print parent ID in btrfs suvolume list

[Andreas Philipp]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

There was some discussion on "where" subvolumes live in. Why do we not
simply print the parent ID for each subvolume in btrfs subvolume list?
This patch adds this functionality when called with parameter "-p".

Signed-off-by: Andreas Philipp <philipp.andreas@gmail.com>
- ---
V1->V2: do not change the default behavior but rather add the switch -p.

 btrfs-list.c |   24 ++++++++++++++++++------
 btrfs.c      |    6 ++++--
 btrfs_cmds.c |   17 +++++++++++++++--
 btrfs_cmds.h |    2 +-
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/btrfs-list.c b/btrfs-list.c
index f804dfc..be20c91 100644
- --- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -200,9 +200,10 @@ static int add_root(struct root_lookup *root_lookup,
  * This can't be called until all the root_info->path fields are filled
  * in by lookup_ino_path
  */
- -static int resolve_root(struct root_lookup *rl, struct root_info *ri)
+static int resolve_root(struct root_lookup *rl, struct root_info *ri, int print_parent)
 {
 	u64 top_id;
+	u64 parent_id = 0;
 	char *full_path = NULL;
 	int len = 0;
 	struct root_info *found;
@@ -233,6 +234,11 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
 		}
 
 		next = found->ref_tree;
+		/* record the first parent */
+		if ( parent_id == 0 ) {
+			parent_id = next;
+		}
+
 		/* if the ref_tree refers to ourselves, we're at the top */
 		if (next == found->root_id) {
 			top_id = next;
@@ -249,9 +255,15 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
 			break;
 		}
 	}
- -	printf("ID %llu top level %llu path %s\n",
- -	       (unsigned long long)ri->root_id, (unsigned long long)top_id,
- -	       full_path);
+	if (print_parent) {
+		printf("ID %llu parent %llu top level %llu path %s\n",
+		       (unsigned long long)ri->root_id, (unsigned long long)parent_id, (unsigned long long)top_id,
+	       		full_path);
+	} else {
+		printf("ID %llu top level %llu path %s\n",
+		       (unsigned long long)ri->root_id, (unsigned long long)top_id,
+	       		full_path);
+	}
 	free(full_path);
 	return 0;
 }
@@ -549,7 +561,7 @@ build:
 	return full;
 }
 
- -int list_subvols(int fd)
+int list_subvols(int fd, int print_parent)
 {
 	struct root_lookup root_lookup;
 	struct rb_node *n;
@@ -666,7 +678,7 @@ int list_subvols(int fd)
 	while (n) {
 		struct root_info *entry;
 		entry = rb_entry(n, struct root_info, rb_node);
- -		resolve_root(&root_lookup, entry);
+		resolve_root(&root_lookup, entry, print_parent);
 		n = rb_prev(n);
 	}
 
diff --git a/btrfs.c b/btrfs.c
index 87cc680..d09823a 100644
- --- a/btrfs.c
+++ b/btrfs.c
@@ -66,9 +66,11 @@ static struct Command commands[] = {
 		"not passed).",
 	  NULL
 	},
- -	{ do_subvol_list, 1, "subvolume list", "<path>\n"
+	{ do_subvol_list, -1, "subvolume list", "[-p] <path>\n"
 		"List the snapshot/subvolume of a filesystem.",
- -	  NULL
+		"[-p] <path>\n"
+		"List the snapshot/subvolume of a filesystem.\n"
+		"-p	   print parent ID"
 	},
 	{ do_set_default_subvol, 2,
 	  "subvolume set-default", "<id> <path>\n"
diff --git a/btrfs_cmds.c b/btrfs_cmds.c
index 062e7d7..9e0c9bc 100644
- --- a/btrfs_cmds.c
+++ b/btrfs_cmds.c
@@ -303,9 +303,22 @@ int do_subvol_list(int argc, char **argv)
 {
 	int fd;
 	int ret;
+	int print_parent = 0;
 	char *subvol;
+        int optind = 1;
 
- -	subvol = argv[1];
+	while(1) {
+		int c = getopt(argc, argv, "p");
+		if (c < 0) break;
+		switch(c) {
+		case 'p':
+			print_parent = 1;
+			optind++;
+			break;
+		}
+	}
+
+	subvol = argv[optind];
 
 	ret = test_issubvolume(subvol);
 	if (ret < 0) {
@@ -322,7 +335,7 @@ int do_subvol_list(int argc, char **argv)
 		fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
 		return 12;
 	}
- -	ret = list_subvols(fd);
+	ret = list_subvols(fd, print_parent);
 	if (ret)
 		return 19;
 	return 0;
diff --git a/btrfs_cmds.h b/btrfs_cmds.h
index 61456fa..83faa5b 100644
- --- a/btrfs_cmds.h
+++ b/btrfs_cmds.h
@@ -34,7 +34,7 @@ int do_scan(int nargs, char **argv);
 int do_resize(int nargs, char **argv);
 int do_subvol_list(int nargs, char **argv);
 int do_set_default_subvol(int nargs, char **argv);
- -int list_subvols(int fd);
+int list_subvols(int fd, int print_parent);
 int do_df_filesystem(int nargs, char **argv);
 int find_updated_files(int fd, u64 root_id, u64 oldest_gen);
 int do_find_newer(int argc, char **argv);
- -- 
1.7.3.4

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJODZ+PAAoJEJIcBJ3+XkgicBwQALSLXlLTQjz7MGdFMi4ijEhA
niJPDTwtVY/ffU6MJAl46fXqP4SRqeVh0ZKTyfTbq2iLRZlQ5jAuLqmjhGCWCMZH
BxSdf+Z6xt4+UYUTtee7LbzFZGKEraWgARhC9IwWXfSGMmxA+0cEGF+/zhqbnl/8
F+NIT8Lf/9B2ePXtB+My+gHjG2fkSxN90+VFb1IsfGg3ENpgXb7aREPCYm9Hv4FG
YA05i2aHFH9g3qjr0edUOFFNDbgqZ+DDMDvT5PdU5JXa9evCj+AWntbanMYsvDFk
o0bazxZHsZ/spR1SLI1r/vZ7frrSE+RJuNEepsbAWg8x8VoabzLCsC6xpUWdWzHS
cqLRTfcNJ/ulqjCalqxTmllov7Bzz23L7DqiecCOWCIrb47xweHDBiTEIt+ou1Ta
N0YHzTRGDFrroAjvRV+az18WKfBIaH7ZGgv7xyOh8A/Y1M+DOZdS1Y73tSDxd6Yk
uF9SIA5vnZzy7ETAixLq2Z964RUhhyJ/+FLAkAqYZ1ZeAYHXEnAAALYY38/k42Na
I9cOyPFwx3Fhl9/u4l2i5b26x+l9EfTZT2+iTBTeJvsZjDMuMtlxEBgZjvjyGo4+
C/dAwYPO3WSMkItKekuRK80VgPOMdlP6kTjHCSuINvmsBcwS6+DfllXdlc0eQ1cQ
eHxJ3pSgQ71aWLekxzch
=ZbBP
-----END PGP SIGNATURE-----

Re: [PATCH v2] print parent ID in btrfs suvolume list

[Goffredo Baroncelli]

On 07/01/2011 12:21 PM, Andreas Philipp wrote:
> There was some discussion on "where" subvolumes live in. Why do we not
> simply print the parent ID for each subvolume in btrfs subvolume list?
> This patch adds this functionality when called with parameter "-p".
> 

Can I ask you to update the man page too ?

> Signed-off-by: Andreas Philipp <philipp.andreas@gmail.com>
> ---
> V1->V2: do not change the default behavior but rather add the switch -p.
> 
>  btrfs-list.c |   24 ++++++++++++++++++------
>  btrfs.c      |    6 ++++--
>  btrfs_cmds.c |   17 +++++++++++++++--
>  btrfs_cmds.h |    2 +-
>  4 files changed, 38 insertions(+), 11 deletions(-)
> 
> diff --git a/btrfs-list.c b/btrfs-list.c
> index f804dfc..be20c91 100644
> --- a/btrfs-list.c
> +++ b/btrfs-list.c
> @@ -200,9 +200,10 @@ static int add_root(struct root_lookup *root_lookup,
>   * This can't be called until all the root_info->path fields are filled
>   * in by lookup_ino_path
>   */
> -static int resolve_root(struct root_lookup *rl, struct root_info *ri)
> +static int resolve_root(struct root_lookup *rl, struct root_info *ri, int print_parent)
>  {
>  	u64 top_id;
> +	u64 parent_id = 0;
>  	char *full_path = NULL;
>  	int len = 0;
>  	struct root_info *found;
> @@ -233,6 +234,11 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
>  		}
>  
>  		next = found->ref_tree;
> +		/* record the first parent */
> +		if ( parent_id == 0 ) {
> +			parent_id = next;
> +		}
> +
>  		/* if the ref_tree refers to ourselves, we're at the top */
>  		if (next == found->root_id) {
>  			top_id = next;
> @@ -249,9 +255,15 @@ static int resolve_root(struct root_lookup *rl, struct root_info *ri)
>  			break;
>  		}
>  	}
> -	printf("ID %llu top level %llu path %s\n",
> -	       (unsigned long long)ri->root_id, (unsigned long long)top_id,
> -	       full_path);
> +	if (print_parent) {
> +		printf("ID %llu parent %llu top level %llu path %s\n",
> +		       (unsigned long long)ri->root_id, (unsigned long long)parent_id, (unsigned long long)top_id,
> +	       		full_path);
> +	} else {
> +		printf("ID %llu top level %llu path %s\n",
> +		       (unsigned long long)ri->root_id, (unsigned long long)top_id,
> +	       		full_path);
> +	}
>  	free(full_path);
>  	return 0;
>  }
> @@ -549,7 +561,7 @@ build:
>  	return full;
>  }
>  
> -int list_subvols(int fd)
> +int list_subvols(int fd, int print_parent)
>  {
>  	struct root_lookup root_lookup;
>  	struct rb_node *n;
> @@ -666,7 +678,7 @@ int list_subvols(int fd)
>  	while (n) {
>  		struct root_info *entry;
>  		entry = rb_entry(n, struct root_info, rb_node);
> -		resolve_root(&root_lookup, entry);
> +		resolve_root(&root_lookup, entry, print_parent);
>  		n = rb_prev(n);
>  	}
>  
> diff --git a/btrfs.c b/btrfs.c
> index 87cc680..d09823a 100644
> --- a/btrfs.c
> +++ b/btrfs.c
> @@ -66,9 +66,11 @@ static struct Command commands[] = {
>  		"not passed).",
>  	  NULL
>  	},
> -	{ do_subvol_list, 1, "subvolume list", "<path>\n"
> +	{ do_subvol_list, -1, "subvolume list", "[-p] <path>\n"
>  		"List the snapshot/subvolume of a filesystem.",
> -	  NULL
> +		"[-p] <path>\n"
> +		"List the snapshot/subvolume of a filesystem.\n"
> +		"-p	   print parent ID"
>  	},
>  	{ do_set_default_subvol, 2,
>  	  "subvolume set-default", "<id> <path>\n"
> diff --git a/btrfs_cmds.c b/btrfs_cmds.c
> index 062e7d7..9e0c9bc 100644
> --- a/btrfs_cmds.c
> +++ b/btrfs_cmds.c
> @@ -303,9 +303,22 @@ int do_subvol_list(int argc, char **argv)
>  {
>  	int fd;
>  	int ret;
> +	int print_parent = 0;
>  	char *subvol;
> +        int optind = 1;
>  
> -	subvol = argv[1];
> +	while(1) {
> +		int c = getopt(argc, argv, "p");
> +		if (c < 0) break;
> +		switch(c) {
> +		case 'p':
> +			print_parent = 1;
> +			optind++;
> +			break;
> +		}
> +	}
> +
> +	subvol = argv[optind];
>  
>  	ret = test_issubvolume(subvol);
>  	if (ret < 0) {
> @@ -322,7 +335,7 @@ int do_subvol_list(int argc, char **argv)
>  		fprintf(stderr, "ERROR: can't access '%s'\n", subvol);
>  		return 12;
>  	}
> -	ret = list_subvols(fd);
> +	ret = list_subvols(fd, print_parent);
>  	if (ret)
>  		return 19;
>  	return 0;
> diff --git a/btrfs_cmds.h b/btrfs_cmds.h
> index 61456fa..83faa5b 100644
> --- a/btrfs_cmds.h
> +++ b/btrfs_cmds.h
> @@ -34,7 +34,7 @@ int do_scan(int nargs, char **argv);
>  int do_resize(int nargs, char **argv);
>  int do_subvol_list(int nargs, char **argv);
>  int do_set_default_subvol(int nargs, char **argv);
> -int list_subvols(int fd);
> +int list_subvols(int fd, int print_parent);
>  int do_df_filesystem(int nargs, char **argv);
>  int find_updated_files(int fd, u64 root_id, u64 oldest_gen);
>  int do_find_newer(int argc, char **argv);
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
.

integration branch updated

[Chris Mason]

Hi everyone,

I've pushed out a rebased integration tree with our patches so far.  I'm
starting more tests now against Linus and linux-next.

-chris