integration tree updated

integration tree updated

[Chris Mason]

Hi everyone,

I've pushed out my current integration branch.  It does have a few of
Miao Xie's patches missing because there were some rejects.  I think
this was just because some things got pulled in out of order, and I'll
get it fixed up.

Also missing is Mark's quota snapshot deletion fixes.  They were
crashing during btrfs/011 with CONFIG_DEBUG_PAGE_ALLOC on.  We'll get
that nailed down.

integration is subject to rebasing, so please treat it more like a patch
queue.  It is very lightly tested, the goal is just to show which
patches are already applied and which ones are still pending.

Thanks!

-chris

Re: integration tree updated

[Qu Wenruo]

Hi chris,

It seems that two of my wrong patches got merged in integration branch:
6068d17c8ab5bce946e9678ed2064e9f966cbe62 btrfs: Merge default subvolume 
mount codes into btrfs_mount_subvol().
8a2166332e332541f13b34b7248c0f14f575731e btrfs: Call mount_subtree() 
even 'subvolid=' mount option is given.

These two patches does not completely work, and the successor patch is 
under review.(the show_path one)

If it is OK for you, please remove these two patches.

Thanks,
Qu
-------- Original Message --------
Subject: integration tree updated
From: Chris Mason <clm@fb.com>
To: linux-btrfs <linux-btrfs@vger.kernel.org>
Date: 2014年07月25日 09:40
> Hi everyone,
>
> I've pushed out my current integration branch.  It does have a few of
> Miao Xie's patches missing because there were some rejects.  I think
> this was just because some things got pulled in out of order, and I'll
> get it fixed up.
>
> Also missing is Mark's quota snapshot deletion fixes.  They were
> crashing during btrfs/011 with CONFIG_DEBUG_PAGE_ALLOC on.  We'll get
> that nailed down.
>
> integration is subject to rebasing, so please treat it more like a patch
> queue.  It is very lightly tested, the goal is just to show which
> patches are already applied and which ones are still pending.
>
> Thanks!
>
> -chris
>
>
> --
> 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: integration tree updated

[Chris Mason]

On 07/24/2014 10:16 PM, Qu Wenruo wrote:
> Hi chris,
> 
> It seems that two of my wrong patches got merged in integration branch:
> 6068d17c8ab5bce946e9678ed2064e9f966cbe62 btrfs: Merge default subvolume
> mount codes into btrfs_mount_subvol().
> 8a2166332e332541f13b34b7248c0f14f575731e btrfs: Call mount_subtree()
> even 'subvolid=' mount option is given.
> 
> These two patches does not completely work, and the successor patch is
> under review.(the show_path one)
> 
> If it is OK for you, please remove these two patches.

Thanks! these are removed.

-chris

Re: integration tree updated

[Anand Jain]

Hi Chris,

  Looks like you missed Miao update (on 17 Jul) to back out the bad
  patch (below), and your integration branch (published on 25 Jul)
  still contains the same.

[PATCH 2/2] Btrfs: fix wrong total device counter after removing a seed 
device

  You should remove it.

  Simple test cases on your integration branch (like btrfs dev del OR
  btrfs/003) is failing due to this and I (+ others would) spend some
  time digging it out


Miao,

  If it helps -
     cur_devices in the loop is null.

BUG: unable to handle kernel NULL pointer dereference at 0000000000000050
IP: [<ffffffffa00a8fc0>] btrfs_rm_device+0x4c0/0x860 [btrfs]

         cur_devices = root->fs_info->fs_devices;
         do {
                 cur_devices->total_devices--;
                 cur_devices = cur_devices->seed;
         } while (device->fs_devices != cur_devices);


  PS: I didn't find the follow-up patch in the mailing list,
     did I missing anything ?

Thanks, Anand


On 07/25/2014 09:40 AM, Chris Mason wrote:
> Hi everyone,
>
> I've pushed out my current integration branch.  It does have a few of
> Miao Xie's patches missing because there were some rejects.  I think
> this was just because some things got pulled in out of order, and I'll
> get it fixed up.
>
> Also missing is Mark's quota snapshot deletion fixes.  They were
> crashing during btrfs/011 with CONFIG_DEBUG_PAGE_ALLOC on.  We'll get
> that nailed down.
>
> integration is subject to rebasing, so please treat it more like a patch
> queue.  It is very lightly tested, the goal is just to show which
> patches are already applied and which ones are still pending.
>
> Thanks!
>
> -chris
>
>
> --
> 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: integration tree updated

[Chris Mason]

On 08/01/2014 05:05 AM, Anand Jain wrote:
> 
> 
> Hi Chris,
> 
>  Looks like you missed Miao update (on 17 Jul) to back out the bad
>  patch (below), and your integration branch (published on 25 Jul)
>  still contains the same.
> 
> [PATCH 2/2] Btrfs: fix wrong total device counter after removing a seed
> device
> 
>  You should remove it.
> 
>  Simple test cases on your integration branch (like btrfs dev del OR
>  btrfs/003) is failing due to this and I (+ others would) spend some
>  time digging it out

Thanks Anand, I'll fix this up along with the other fixes from the last
week and push out a new branch.

-chris