When everything is OK in bch_journal_read(), finally the return value
is returned by,
        return ret;
which assumes ret will be 0 here. This assumption is wrong when all
journal buckets as are full and filled with valid journal entries. In
such cache the last location referencess read_bucket() sets 'ret' to
1, which means new jset added into jset list. The jset list is list
'journal' in caller run_cache_set().

Return 1 to run_cache_set() means something wrong and the cache set
won't start, but indeed everything is OK.

This patch changes the line at end of bch_journal_read() to directly
return 0 since everything if verything is good. Then a bogus error
is fixed.

Signed-off-by: Coly Li <[email protected]>
---
 drivers/md/bcache/journal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index d75efeaa4baa..7beff8884dd0 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -293,7 +293,7 @@ int bch_journal_read(struct cache_set *c, struct list_head 
*list)
                                            struct journal_replay,
                                            list)->j.seq;
 
-       return ret;
+       return 0;
 #undef read_bucket
 }
 
-- 
2.16.4

Reply via email to