MAINTAINERS: BCACHE: Kent Overstreet has changed email address

Kent's email address in MAINTAINERS seems to be invalid.
This was his last sign-off address, so use that if appropriate.

Fix the S: status entry while there.

Signed-off-by: Joe Perches <[email protected]>
Acked-by: Kent Overstreet <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 67afc4de50ceab2b476d5e0bcfaf0486a3f7e96d..79faf013c2ba43af2372b33959defee2c3ec5fb8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2026,10 +2026,10 @@ S:      Maintained
 F:     drivers/net/hamradio/baycom*
 
 BCACHE (BLOCK LAYER CACHE)
-M:     Kent Overstreet <kmo@daterainc.com>
+M:     Kent Overstreet <kent.overstreet@gmail.com>
 L:     [email protected]
 W:     http://bcache.evilpiepirate.org
-S:     Maintained:
+S:     Maintained
 F:     drivers/md/bcache/
 
 BDISP ST MEDIA DRIVER

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index fe080ad0e55841e5c95bfcb3dcf3a0f1a703b76c..ce64fc8512518c6bff63b9a551d931341aaf6f84 100644 (file)
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -157,7 +157,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
 
        for_each_cache(ca, c, iter) {
                struct journal_device *ja = &ca->journal;
-               unsigned long bitmap[SB_JOURNAL_BUCKETS / BITS_PER_LONG];
+               DECLARE_BITMAP(bitmap, SB_JOURNAL_BUCKETS);
                unsigned i, l, r, m;
                uint64_t seq;