btrfs-progs: new integration branch out

btrfs-progs: new integration branch out

[Hugo Mills]

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

   All - 

   After a long wait (sorry about that, things have been busy for me
lately), I've managed to pull together a new integration branch for
btrfs-progs. This can be pulled from:

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

   This is only compile-tested so far, so there may still be serious
problems with it. Please take care. I'm not likely to be able to do
much additional work on it before the weekend, so I thought it would
be better to get *something* out, even if it's unstable/buggy. This
_is_ the integration branch, after all...

   Fixes or updated patches for any problems you may find are
welcomed, of course.

   I've got a few additional things still to bring in -- David Sterba
did a trawl round quite a few distributions and turned up a couple of
useful-looking patches that he's sent my way; plus there's Jan
Schmidt's inspect-internal patches, which sadly clashed horribly with
Xin Zhong's subvol-get-default patch.

   I hope I'll be able to run up another version within the week with
these other parts in it, and actually do some proper review/testing on
it before it goes out.

   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
       --- Great oxymorons of the world, no. 6: Mature Student ---       

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

Re: btrfs-progs: new integration branch out

[Fajar A. Nugraha]

On Wed, Oct 12, 2011 at 7:34 PM, Hugo Mills <hugo@carfax.org.uk> wrote:
> =A0 All -
>
> =A0 After a long wait (sorry about that, things have been busy for me
> lately), I've managed to pull together a new integration branch for
> btrfs-progs. This can be pulled from:
>
> http://git.darksatanic.net/repo/btrfs-progs-unstable.git/ integration=
-20111012
>
> =A0 This is only compile-tested so far, so there may still be serious
> problems with it. Please take care. I'm not likely to be able to do
> much additional work on it before the weekend, so I thought it would
> be better to get *something* out, even if it's unstable/buggy. This
> _is_ the integration branch, after all...
>
> =A0 Fixes or updated patches for any problems you may find are
> welcomed, of course.
>
> =A0 I've got a few additional things still to bring in -- David Sterb=
a
> did a trawl round quite a few distributions and turned up a couple of
> useful-looking patches that he's sent my way; plus there's Jan
> Schmidt's inspect-internal patches, which sadly clashed horribly with
> Xin Zhong's subvol-get-default patch.
>
> =A0 I hope I'll be able to run up another version within the week wit=
h
> these other parts in it, and actually do some proper review/testing o=
n
> it before it goes out.

Personally I'd like to see Josef's work on
https://github.com/josefbacik/btrfs-progs merged, in particular the
"restore" command (which should be useful even when a working fsck is
available). I'm not sure though if it's intended to be merged or just
a personal project as this point.

Also a small note on grouping of "btrfs" commands help text. For
example, it now jumps from "btrfs filesystem label" to four "btrfs
scrub" commands, then back to "btrfs filesystem restripe". Not really
critical, just cosmetic.

--=20
=46ajar
--
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

Re: btrfs-progs: new integration branch out

[Fajar A. Nugraha]

On Wed, Oct 12, 2011 at 7:34 PM, Hugo Mills <hugo@carfax.org.uk> wrote:
> =A0 Fixes or updated patches for any problems you may find are
> welcomed, of course.

I noticed that "btrfs subvolume snapshot" is now broken. It keeps on
saying "Invalid arguments for subvolume snapshot".

=46urther checking shows it's caused by

commit f71210f87e0c684d8c76dfa2e19ea86256fc3d1f
Author: Andreas Philipp <philipp.andreas@gmail.com>
Date:   Thu Aug 11 08:45:40 2011 +0200

    check number of args for btrfs sub snap correctly

    Check whether there are the right number of arguments (exatly 2 wit=
hout
    the flag -r) in the subcommand handler for the btrfs subvolume snap=
shot
    command.



changing

       if (argc - optind !=3D 3) {

back to

       if (argc - optind !=3D 2) {

makes the snapshot creation works again, tested both with and without
"-r" on Ubuntu Natty + kernel 3.1.0-rc9. I reverted that commit for my
system for now.

--=20
=46ajar
--
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

Re: btrfs-progs: new integration branch out

[Mitch Harder]

On Wed, Oct 12, 2011 at 10:22 AM, Fajar A. Nugraha <list@fajar.net> wro=
te:
> On Wed, Oct 12, 2011 at 7:34 PM, Hugo Mills <hugo@carfax.org.uk> wrot=
e:
>> =A0 Fixes or updated patches for any problems you may find are
>> welcomed, of course.
>
> I noticed that "btrfs subvolume snapshot" is now broken. It keeps on
> saying "Invalid arguments for subvolume snapshot".
>
> Further checking shows it's caused by
>
> commit f71210f87e0c684d8c76dfa2e19ea86256fc3d1f
> Author: Andreas Philipp <philipp.andreas@gmail.com>
> Date: =A0 Thu Aug 11 08:45:40 2011 +0200
>
> =A0 =A0check number of args for btrfs sub snap correctly
>
> =A0 =A0Check whether there are the right number of arguments (exatly =
2 without
> =A0 =A0the flag -r) in the subcommand handler for the btrfs subvolume=
 snapshot
> =A0 =A0command.
>
>
>
> changing
>
> =A0 =A0 =A0 if (argc - optind !=3D 3) {
>
> back to
>
> =A0 =A0 =A0 if (argc - optind !=3D 2) {
>
> makes the snapshot creation works again, tested both with and without
> "-r" on Ubuntu Natty + kernel 3.1.0-rc9. I reverted that commit for m=
y
> system for now.
>

It looks like there have been two patches that touched on this issue,
and they conflicted with one-another.

Arne Jansen's "btrfs-progs: add qgroup commands" patch added a "optind
=3D 1;" line, where optind was defaulting to zero before.

This conflicted with Hugo Mills"fix incorrect argument checking for
"btrfs sub snap -r"" patch.

So it looks like "(argc - optind !=3D 2)" is now correct.
--
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

Re: btrfs-progs: new integration branch out

[Fajar A. Nugraha]

On Wed, Oct 12, 2011 at 11:50 PM, Mitch Harder
<mitch.harder@sabayonlinux.org> wrote:
> On Wed, Oct 12, 2011 at 10:22 AM, Fajar A. Nugraha <list@fajar.net> w=
rote:

>> I noticed that "btrfs subvolume snapshot" is now broken. It keeps on
>> saying "Invalid arguments for subvolume snapshot".
>>
>> Further checking shows it's caused by
>>
>> commit f71210f87e0c684d8c76dfa2e19ea86256fc3d1f
>> Author: Andreas Philipp <philipp.andreas@gmail.com>
>> Date: =A0 Thu Aug 11 08:45:40 2011 +0200
>>
>> =A0 =A0check number of args for btrfs sub snap correctly

>
> It looks like there have been two patches that touched on this issue,
> and they conflicted with one-another.
>
> Arne Jansen's "btrfs-progs: add qgroup commands" patch added a "optin=
d
> =3D 1;" line, where optind was defaulting to zero before.
>
> This conflicted with Hugo Mills"fix incorrect argument checking for
> "btrfs sub snap -r"" patch.
>
> So it looks like "(argc - optind !=3D 2)" is now correct.
>

Ah, that explains it then. Thanks.

--=20
=46ajar
--
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