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 <joe@perches.com>
Acked-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 67afc4de50ce..79faf013c2ba 100644
--- 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:      linux-bcache@vger.kernel.org
 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 fe080ad0e558..ce64fc851251 100644
--- 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;