diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-12-17 12:54:03 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-17 12:54:03 -0700 |
| commit | 60e53a6701ca55b3399275d805d223834819d9ce (patch) | |
| tree | 3380b66805b21b57a6ca20bbc7d85aba7b145805 /drivers/md/bcache/super.c | |
| parent | 8515736604941334bd9e8fc01edea685a228acd5 (diff) | |
| parent | 16749c23c00c686ed168471963e3ddb0f3fcd855 (diff) | |
Merge branch 'bcache-for-3.13' of git://evilpiepirate.org/~kent/linux-bcache into for-linus
Kent writes:
Jens - small pile of bcache fixes. I've been slacking on the writeback
fixes but those definitely need to get into 3.13.
Diffstat (limited to 'drivers/md/bcache/super.c')
| -rw-r--r-- | drivers/md/bcache/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index dec15cd2d79..c57bfa071a5 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1676,7 +1676,7 @@ err: static bool can_attach_cache(struct cache *ca, struct cache_set *c) { return ca->sb.block_size == c->sb.block_size && - ca->sb.bucket_size == c->sb.block_size && + ca->sb.bucket_size == c->sb.bucket_size && ca->sb.nr_in_set == c->sb.nr_in_set; } |