]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: check CACHE_SET_IO_DISABLE bit in bch_journal()
authorColy Li <colyli@suse.de>
Fri, 28 Jun 2019 11:59:36 +0000 (19:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:12:46 +0000 (09:12 +0200)
[ Upstream commit 383ff2183ad16a8842d1fbd9dd3e1cbd66813e64 ]

When too many I/O errors happen on cache set and CACHE_SET_IO_DISABLE
bit is set, bch_journal() may continue to work because the journaling
bkey might be still in write set yet. The caller of bch_journal() may
believe the journal still work but the truth is in-memory journal write
set won't be written into cache device any more. This behavior may
introduce potential inconsistent metadata status.

This patch checks CACHE_SET_IO_DISABLE bit at the head of bch_journal(),
if the bit is set, bch_journal() returns NULL immediately to notice
caller to know journal does not work.

Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/bcache/journal.c

index 6c94fa007796894eae1299cdfe0692e2ca317f5a..ac3cec56ec1909650f5eb73a7221bb194ed52ead 100644 (file)
@@ -810,6 +810,10 @@ atomic_t *bch_journal(struct cache_set *c,
        struct journal_write *w;
        atomic_t *ret;
 
+       /* No journaling if CACHE_SET_IO_DISABLE set already */
+       if (unlikely(test_bit(CACHE_SET_IO_DISABLE, &c->flags)))
+               return NULL;
+
        if (!CACHE_SYNC(&c->sb))
                return NULL;