Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers

Browse source

Kent writes:

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.

...

This commit is contained in:

Jens Axboe 2013-05-01 09:23:05 +02:00

parent 0821e90405 ee66850642

commit f50efd2fdb

6 changed files with 213 additions and 112 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

72

drivers/md/bcache/alloc.c

View file

47

drivers/md/bcache/bcache.h

View file

3

drivers/md/bcache/btree.c

View file

35

drivers/md/bcache/io.c

View file

2

drivers/md/bcache/request.c

View file

178

drivers/md/bcache/super.c

View file