bcache: Fix a bug recovering from unclean shutdown

The code to fixup incorrect bucket prios incorrectly did not skip btree node
freeing keys

Signed-off-by: Kent Overstreet <kmo@daterainc.com>

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 5f9c2a665ca5079bd372646f70de2117a77b995a..2d4a864865ebcdb84a201ec19dfc1a7affedc9b3 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -1726,9 +1726,9 @@ static int bch_btree_check_recurse(struct btree *b, struct btree_op *op,
                            !ptr_stale(b->c, k, i)) {
                                g->gen = PTR_GEN(k, i);
 
-                               if (b->level)
+                               if (b->level && bkey_cmp(k, &ZERO_KEY))
                                        g->prio = BTREE_PRIO;
-                               else if (g->prio == BTREE_PRIO)
+                               else if (!b->level && g->prio == BTREE_PRIO)
                                        g->prio = INITIAL_PRIO;
                        }
                }