diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-06-30 23:54:41 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-06-30 23:55:54 -0400 |
| commit | 4d6bbd80f7721052e064e5527733c9cec8ce1721 (patch) | |
| tree | c05bb39ed6f48084ed4aba416fe78e3eb940846b | |
| parent | 48d18c0a175427388138493c8e7e4b85702a7847 (diff) | |
bcachefs: don't expose extent whiteouts XXX unfinishedbtree-iter
| -rw-r--r-- | fs/bcachefs/bset.h | 4 | ||||
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/bset.h b/fs/bcachefs/bset.h index 5895362e0af3..5e53a013484e 100644 --- a/fs/bcachefs/bset.h +++ b/fs/bcachefs/bset.h @@ -552,7 +552,7 @@ bch2_btree_node_iter_peek_all(struct btree_node_iter *iter, static inline struct bkey_packed * bch2_btree_node_iter_peek(struct btree_node_iter *iter, struct btree *b) { - return bch2_btree_node_iter_peek_filter(iter, b, KEY_TYPE_DELETED + 1); + return bch2_btree_node_iter_peek_filter(iter, b, KEY_TYPE_DISCARD + 1); } static inline struct bkey_packed * @@ -578,7 +578,7 @@ bch2_btree_node_iter_prev_all(struct btree_node_iter *iter, struct btree *b) static inline struct bkey_packed * bch2_btree_node_iter_prev(struct btree_node_iter *iter, struct btree *b) { - return bch2_btree_node_iter_prev_filter(iter, b, KEY_TYPE_DELETED + 1); + return bch2_btree_node_iter_prev_filter(iter, b, KEY_TYPE_DISCARD + 1); } /* diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index c44cadb8e784..cee78b44caa2 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1338,7 +1338,7 @@ struct bkey_s_c bch2_btree_iter_next(struct btree_iter *iter) p = bch2_btree_node_iter_peek_all(&l->iter, l->b); if (unlikely(!p)) return bch2_btree_iter_peek_next_leaf(iter); - } while (bkey_deleted(p)); + } while (bkey_whiteout(p)); k = __btree_iter_unpack(iter, l, &iter->k, p); |