[GIT PULL] Bcache fixes for 3.10

[GIT PULL] Bcache fixes for 3.10

[Kent Overstreet]

Hey Jens, this is everything I've got ready for 3.10 - there's _still_
one more bug I'm trying to track down.

Andrew - I've got patches that rip out the pkey() and pbtree() macros,
but they're somewhat tied up with some other nontrivial refactorings so
I think I'm going to wait a bit on those.

The following changes since commit cef5279735d3f6f0243e626963e6d5c84efade0a:

  bcache: Disable broken btree fuzz tester (2013-04-08 13:33:49 -0700)

are available in the git repository at:

  http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream

for you to fetch changes up to cd66f1f69ed40270bb34e20b25a8111bc72a1b2a:

  bcache: Use bd_link_disk_holder() (2013-04-24 13:15:17 -0700)

----------------------------------------------------------------
Kent Overstreet (8):
      bcache: Take data offset from the bdev superblock.
      bcache: Set ra_pages based on backing device's ra_pages
      bcache: Hack around stuff that clones up to bi_max_vecs
      bcache: Correctly check against BIO_MAX_PAGES
      bcache: Fix merge_bvec_fn usage for when it modifies the bvm
      bcache: Make sure blocksize isn't smaller than device blocksize
      bcache: Allocator cleanup/fixes
      bcache: Use bd_link_disk_holder()

 drivers/md/bcache/alloc.c   |  74 +++++++++++++-------
 drivers/md/bcache/bcache.h  |  48 ++++++++++---
 drivers/md/bcache/btree.c   |   8 +--
 drivers/md/bcache/io.c      |  35 ++++++----
 drivers/md/bcache/request.c |   2 +-
 drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
 6 files changed, 215 insertions(+), 118 deletions(-)

Re: [GIT PULL] Bcache fixes for 3.10

[Jens Axboe]

On Tue, Apr 30 2013, Kent Overstreet wrote:
> Hey Jens, this is everything I've got ready for 3.10 - there's _still_
> one more bug I'm trying to track down.
> 
> Andrew - I've got patches that rip out the pkey() and pbtree() macros,
> but they're somewhat tied up with some other nontrivial refactorings so
> I think I'm going to wait a bit on those.
> 
> The following changes since commit cef5279735d3f6f0243e626963e6d5c84efade0a:
> 
>   bcache: Disable broken btree fuzz tester (2013-04-08 13:33:49 -0700)
> 
> are available in the git repository at:
> 
>   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> 
> for you to fetch changes up to cd66f1f69ed40270bb34e20b25a8111bc72a1b2a:
> 
>   bcache: Use bd_link_disk_holder() (2013-04-24 13:15:17 -0700)
> 
> ----------------------------------------------------------------
> Kent Overstreet (8):
>       bcache: Take data offset from the bdev superblock.
>       bcache: Set ra_pages based on backing device's ra_pages
>       bcache: Hack around stuff that clones up to bi_max_vecs
>       bcache: Correctly check against BIO_MAX_PAGES
>       bcache: Fix merge_bvec_fn usage for when it modifies the bvm
>       bcache: Make sure blocksize isn't smaller than device blocksize
>       bcache: Allocator cleanup/fixes
>       bcache: Use bd_link_disk_holder()
> 
>  drivers/md/bcache/alloc.c   |  74 +++++++++++++-------
>  drivers/md/bcache/bcache.h  |  48 ++++++++++---
>  drivers/md/bcache/btree.c   |   8 +--
>  drivers/md/bcache/io.c      |  35 ++++++----
>  drivers/md/bcache/request.c |   2 +-
>  drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
>  6 files changed, 215 insertions(+), 118 deletions(-)

This is what I got, when I pulled it in:

Merge made by the 'recursive' strategy.
 drivers/md/bcache/alloc.c   |  72 +++++++++++++------
 drivers/md/bcache/bcache.h  |  47 ++++++++++---
 drivers/md/bcache/btree.c   |   3 +-
 drivers/md/bcache/io.c      |  35 ++++++----
 drivers/md/bcache/request.c |   2 +-
 drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
 6 files changed, 213 insertions(+), 112 deletions(-)

I only see the same 8 commits there. What happened? Please check
for-3.10/drivers and verify it looks as you expect.

-- 
Jens Axboe

Re: [GIT PULL] Bcache fixes for 3.10

[Kent Overstreet]

On Wed, May 01, 2013 at 09:26:16AM +0200, Jens Axboe wrote:
> On Tue, Apr 30 2013, Kent Overstreet wrote:
> > Hey Jens, this is everything I've got ready for 3.10 - there's _still_
> > one more bug I'm trying to track down.
> > 
> > Andrew - I've got patches that rip out the pkey() and pbtree() macros,
> > but they're somewhat tied up with some other nontrivial refactorings so
> > I think I'm going to wait a bit on those.
> > 
> > The following changes since commit cef5279735d3f6f0243e626963e6d5c84efade0a:
> > 
> >   bcache: Disable broken btree fuzz tester (2013-04-08 13:33:49 -0700)
> > 
> > are available in the git repository at:
> > 
> >   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> > 
> > for you to fetch changes up to cd66f1f69ed40270bb34e20b25a8111bc72a1b2a:
> > 
> >   bcache: Use bd_link_disk_holder() (2013-04-24 13:15:17 -0700)
> > 
> > ----------------------------------------------------------------
> > Kent Overstreet (8):
> >       bcache: Take data offset from the bdev superblock.
> >       bcache: Set ra_pages based on backing device's ra_pages
> >       bcache: Hack around stuff that clones up to bi_max_vecs
> >       bcache: Correctly check against BIO_MAX_PAGES
> >       bcache: Fix merge_bvec_fn usage for when it modifies the bvm
> >       bcache: Make sure blocksize isn't smaller than device blocksize
> >       bcache: Allocator cleanup/fixes
> >       bcache: Use bd_link_disk_holder()
> > 
> >  drivers/md/bcache/alloc.c   |  74 +++++++++++++-------
> >  drivers/md/bcache/bcache.h  |  48 ++++++++++---
> >  drivers/md/bcache/btree.c   |   8 +--
> >  drivers/md/bcache/io.c      |  35 ++++++----
> >  drivers/md/bcache/request.c |   2 +-
> >  drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
> >  6 files changed, 215 insertions(+), 118 deletions(-)
> 
> This is what I got, when I pulled it in:
> 
> Merge made by the 'recursive' strategy.
>  drivers/md/bcache/alloc.c   |  72 +++++++++++++------
>  drivers/md/bcache/bcache.h  |  47 ++++++++++---
>  drivers/md/bcache/btree.c   |   3 +-
>  drivers/md/bcache/io.c      |  35 ++++++----
>  drivers/md/bcache/request.c |   2 +-
>  drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
>  6 files changed, 213 insertions(+), 112 deletions(-)
> 
> I only see the same 8 commits there. What happened? Please check
> for-3.10/drivers and verify it looks as you expect.

Oh, were you expecting me to rebase? Result looks good, though.

Re: [GIT PULL] Bcache fixes for 3.10

[Jens Axboe]

On Wed, May 01 2013, Kent Overstreet wrote:
> On Wed, May 01, 2013 at 09:26:16AM +0200, Jens Axboe wrote:
> > On Tue, Apr 30 2013, Kent Overstreet wrote:
> > > Hey Jens, this is everything I've got ready for 3.10 - there's _still_
> > > one more bug I'm trying to track down.
> > > 
> > > Andrew - I've got patches that rip out the pkey() and pbtree() macros,
> > > but they're somewhat tied up with some other nontrivial refactorings so
> > > I think I'm going to wait a bit on those.
> > > 
> > > The following changes since commit cef5279735d3f6f0243e626963e6d5c84efade0a:
> > > 
> > >   bcache: Disable broken btree fuzz tester (2013-04-08 13:33:49 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> > > 
> > > for you to fetch changes up to cd66f1f69ed40270bb34e20b25a8111bc72a1b2a:
> > > 
> > >   bcache: Use bd_link_disk_holder() (2013-04-24 13:15:17 -0700)
> > > 
> > > ----------------------------------------------------------------
> > > Kent Overstreet (8):
> > >       bcache: Take data offset from the bdev superblock.
> > >       bcache: Set ra_pages based on backing device's ra_pages
> > >       bcache: Hack around stuff that clones up to bi_max_vecs
> > >       bcache: Correctly check against BIO_MAX_PAGES
> > >       bcache: Fix merge_bvec_fn usage for when it modifies the bvm
> > >       bcache: Make sure blocksize isn't smaller than device blocksize
> > >       bcache: Allocator cleanup/fixes
> > >       bcache: Use bd_link_disk_holder()
> > > 
> > >  drivers/md/bcache/alloc.c   |  74 +++++++++++++-------
> > >  drivers/md/bcache/bcache.h  |  48 ++++++++++---
> > >  drivers/md/bcache/btree.c   |   8 +--
> > >  drivers/md/bcache/io.c      |  35 ++++++----
> > >  drivers/md/bcache/request.c |   2 +-
> > >  drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
> > >  6 files changed, 215 insertions(+), 118 deletions(-)
> > 
> > This is what I got, when I pulled it in:
> > 
> > Merge made by the 'recursive' strategy.
> >  drivers/md/bcache/alloc.c   |  72 +++++++++++++------
> >  drivers/md/bcache/bcache.h  |  47 ++++++++++---
> >  drivers/md/bcache/btree.c   |   3 +-
> >  drivers/md/bcache/io.c      |  35 ++++++----
> >  drivers/md/bcache/request.c |   2 +-
> >  drivers/md/bcache/super.c   | 166 +++++++++++++++++++++++++++-----------------
> >  6 files changed, 213 insertions(+), 112 deletions(-)
> > 
> > I only see the same 8 commits there. What happened? Please check
> > for-3.10/drivers and verify it looks as you expect.
> 
> Oh, were you expecting me to rebase? Result looks good, though.

Nope, in fact your series was on top of the last commit I got from you,
cef52797. Only non-bcache in between. Just wondering how that 215
insertions and 118 deletions becames 213/112 for that case.

-- 
Jens Axboe

Re: [GIT PULL] Bcache fixes for 3.10

[Kent Overstreet]

On Wed, May 1, 2013 at 12:05 PM, Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org> wrote:
> Nope, in fact your series was on top of the last commit I got from you,
> cef52797. Only non-bcache in between. Just wondering how that 215
> insertions and 118 deletions becames 213/112 for that case.

Oh, that. That was a last minute bugfix, just backed out part of a
change. Sorry :P

Re: [GIT PULL] Bcache fixes for 3.10

[Jens Axboe]

On Wed, May 01 2013, Kent Overstreet wrote:
> On Wed, May 1, 2013 at 12:05 PM, Jens Axboe <axboe@kernel.dk> wrote:
> > Nope, in fact your series was on top of the last commit I got from you,
> > cef52797. Only non-bcache in between. Just wondering how that 215
> > insertions and 118 deletions becames 213/112 for that case.
> 
> Oh, that. That was a last minute bugfix, just backed out part of a
> change. Sorry :P

Aha! Busted.

-- 
Jens Axboe

[GIT PULL] Bcache fixes for 3.10

[Kent Overstreet]

Jens - couple more bcache patches. Bug fixes and a doc update.

The following changes since commit f50efd2fdbd9b35b11f5778ed85beb764184bda9:

  Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers (2013-05-01 09:23:05 +0200)

are available in the git repository at:


  http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream

for you to fetch changes up to f59fce847fc8483508b5028c24e2b1e00523dd88:

  bcache: Fix error handling in init code (2013-05-15 00:48:14 -0700)

----------------------------------------------------------------
Emil Goode (1):
      bcache: Fix incompatible pointer type warning

Gabriel (1):
      bcache: clarify free/available/unused space

Kent Overstreet (1):
      bcache: Fix error handling in init code

Paul Bolle (1):
      bcache: drop "select CLOSURES"

 Documentation/bcache.txt      |   12 ++-
 drivers/md/bcache/Kconfig     |    1 -
 drivers/md/bcache/bcache.h    |    2 +-
 drivers/md/bcache/stats.c     |   34 ++++----
 drivers/md/bcache/super.c     |  185 ++++++++++++++++++-----------------------
 drivers/md/bcache/writeback.c |    2 +-
 6 files changed, 109 insertions(+), 127 deletions(-)

Re: [GIT PULL] Bcache fixes for 3.10

[Jens Axboe]

On Wed, May 15 2013, Kent Overstreet wrote:
> Jens - couple more bcache patches. Bug fixes and a doc update.
> 
> The following changes since commit f50efd2fdbd9b35b11f5778ed85beb764184bda9:
> 
>   Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers (2013-05-01 09:23:05 +0200)
> 
> are available in the git repository at:
> 
> 
>   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> 
> for you to fetch changes up to f59fce847fc8483508b5028c24e2b1e00523dd88:
> 
>   bcache: Fix error handling in init code (2013-05-15 00:48:14 -0700)

No workie:

axboe@nelson:/src/linux-block $ git pull
http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
error: Unable to find b09beb2b52c74a69b45da259e5684e3bf3b1ca08 under
http://evilpiepirate.org/git/linux-bcache.git
Cannot obtain needed blob b09beb2b52c74a69b45da259e5684e3bf3b1ca08
while processing commit 867e1162068eb5632c829d453fd65d6089564f55.
error: Fetch failed.

In general, http:// git just sucks. If you can't host git:// on your own
box, please consider moving to a kernel.org or similar hosting.

-- 
Jens Axboe

Re: [GIT PULL] Bcache fixes for 3.10

[Kent Overstreet]

On Wed, May 15, 2013 at 10:06:45AM +0200, Jens Axboe wrote:
> On Wed, May 15 2013, Kent Overstreet wrote:
> > Jens - couple more bcache patches. Bug fixes and a doc update.
> > 
> > The following changes since commit f50efd2fdbd9b35b11f5778ed85beb764184bda9:
> > 
> >   Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers (2013-05-01 09:23:05 +0200)
> > 
> > are available in the git repository at:
> > 
> > 
> >   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> > 
> > for you to fetch changes up to f59fce847fc8483508b5028c24e2b1e00523dd88:
> > 
> >   bcache: Fix error handling in init code (2013-05-15 00:48:14 -0700)
> 
> No workie:
> 
> axboe@nelson:/src/linux-block $ git pull
> http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> error: Unable to find b09beb2b52c74a69b45da259e5684e3bf3b1ca08 under
> http://evilpiepirate.org/git/linux-bcache.git
> Cannot obtain needed blob b09beb2b52c74a69b45da259e5684e3bf3b1ca08
> while processing commit 867e1162068eb5632c829d453fd65d6089564f55.
> error: Fetch failed.

Argh.

> In general, http:// git just sucks.

Yeah, but cloning over git:// seems to use a fair amount more memory
than dumb http, so that's the one I publish :/ But I do have git daemon
running, try this:

git://evilpiepirate.org/~kent/linux-bcache.git bcache-for-upstream

> If you can't host git:// on your own
> box, please consider moving to a kernel.org or similar hosting.

I'd love to not have to deal with this stuff anymore, do you know who
gives those out?

Re: [GIT PULL] Bcache fixes for 3.10

[Jens Axboe]

On Wed, May 15 2013, Kent Overstreet wrote:
> On Wed, May 15, 2013 at 10:06:45AM +0200, Jens Axboe wrote:
> > On Wed, May 15 2013, Kent Overstreet wrote:
> > > Jens - couple more bcache patches. Bug fixes and a doc update.
> > > 
> > > The following changes since commit f50efd2fdbd9b35b11f5778ed85beb764184bda9:
> > > 
> > >   Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers (2013-05-01 09:23:05 +0200)
> > > 
> > > are available in the git repository at:
> > > 
> > > 
> > >   http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> > > 
> > > for you to fetch changes up to f59fce847fc8483508b5028c24e2b1e00523dd88:
> > > 
> > >   bcache: Fix error handling in init code (2013-05-15 00:48:14 -0700)
> > 
> > No workie:
> > 
> > axboe@nelson:/src/linux-block $ git pull
> > http://evilpiepirate.org/git/linux-bcache.git bcache-for-upstream
> > error: Unable to find b09beb2b52c74a69b45da259e5684e3bf3b1ca08 under
> > http://evilpiepirate.org/git/linux-bcache.git
> > Cannot obtain needed blob b09beb2b52c74a69b45da259e5684e3bf3b1ca08
> > while processing commit 867e1162068eb5632c829d453fd65d6089564f55.
> > error: Fetch failed.
> 
> Argh.
> 
> > In general, http:// git just sucks.
> 
> Yeah, but cloning over git:// seems to use a fair amount more memory
> than dumb http, so that's the one I publish :/ But I do have git daemon
> running, try this:
> 
> git://evilpiepirate.org/~kent/linux-bcache.git bcache-for-upstream

Thanks, that worked, pulled.

> > If you can't host git:// on your own
> > box, please consider moving to a kernel.org or similar hosting.
> 
> I'd love to not have to deal with this stuff anymore, do you know who
> gives those out?

Konstantin Ryabitsev <mricon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> should be able to help you out,
in CC.

-- 
Jens Axboe

Re: [GIT PULL] Bcache fixes for 3.10

[Konstantin Ryabitsev]

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

On 15/05/13 04:38 AM, Jens Axboe wrote:
>>> If you can't host git:// on your own
>>> > > box, please consider moving to a kernel.org or similar hosting.
>> > 
>> > I'd love to not have to deal with this stuff anymore, do you know who
>> > gives those out?
> Konstantin Ryabitsev <mricon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> should be able to help you out,
> in CC.

It's the kernel.org infra-steering crew that gives out accounts (HPA,
Greg KH), I just turn the necessary knobs. :)

Please see the following page on how to request a kernel.org account:
https://www.kernel.org/category/faq.html#can-i-get-an-account-on-kernel-org

Best,
-- 
Konstantin Ryabitsev
Senior Systems Administrator
Linux Foundation Collab Projects
Montréal, Québec


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 730 bytes --]