From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 11 May 2019 21:29:20 +0000 (-0400)
Subject: bcachefs: Don't hardcode BTREE_ID_EXTENTS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ab5c63f5dd3dcdb7943056c6e31ee62325010dc3;p=linux.git

bcachefs: Don't hardcode BTREE_ID_EXTENTS

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 4bdbdd22b437d..ac3c3769e1261 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1114,7 +1114,7 @@ static inline void bch2_btree_iter_checks(struct btree_iter *iter,
 {
 	EBUG_ON(iter->btree_id >= BTREE_ID_NR);
 	EBUG_ON(!!(iter->flags & BTREE_ITER_IS_EXTENTS) !=
-		(iter->btree_id == BTREE_ID_EXTENTS &&
+		(btree_node_type_is_extents(iter->btree_id) &&
 		 type != BTREE_ITER_NODES));
 
 	bch2_btree_trans_verify_locks(iter->trans);
@@ -1590,7 +1590,7 @@ static inline void bch2_btree_iter_init(struct btree_trans *trans,
 	struct bch_fs *c = trans->c;
 	unsigned i;
 
-	if (btree_id == BTREE_ID_EXTENTS &&
+	if (btree_node_type_is_extents(btree_id) &&
 	    !(flags & BTREE_ITER_NODES))
 		flags |= BTREE_ITER_IS_EXTENTS;
 
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 0a4c6c76e43b5..dc15d1b831a8c 100644
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -156,7 +156,7 @@ static inline struct bpos btree_type_successor(enum btree_id id,
 	if (id == BTREE_ID_INODES) {
 		pos.inode++;
 		pos.offset = 0;
-	} else if (id != BTREE_ID_EXTENTS) {
+	} else if (!btree_node_type_is_extents(id)) {
 		pos = bkey_successor(pos);
 	}
 
@@ -169,7 +169,7 @@ static inline struct bpos btree_type_predecessor(enum btree_id id,
 	if (id == BTREE_ID_INODES) {
 		--pos.inode;
 		pos.offset = 0;
-	} else /* if (id != BTREE_ID_EXTENTS) */ {
+	} else {
 		pos = bkey_predecessor(pos);
 	}