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 --]

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