diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 96d2dd58..1140549d 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -6,16 +6,6 @@ ccflags-y += -include $(src)/kernelcompat.h -# -# v5.3-12296-g6d2052d188d9 -# -# The RBCOMPUTE function is now passed an extra flag, and should return a bool -# to indicate whether the propagated callback should stop or not. -# -ifneq (,$(shell grep 'static inline bool RBNAME.*_compute_max' include/linux/rbtree_augmented.h)) -ccflags-y += -DKC_RB_TREE_AUGMENTED_COMPUTE_MAX -endif - # # v4.8-rc1-29-g31051c85b5e2 # diff --git a/kmod/src/tseq.c b/kmod/src/tseq.c index 2621406f..d4d24fc7 100644 --- a/kmod/src/tseq.c +++ b/kmod/src/tseq.c @@ -46,7 +46,6 @@ static struct scoutfs_tseq_entry *tseq_rb_next(struct scoutfs_tseq_entry *ent) return rb_entry(node, struct scoutfs_tseq_entry, node); } -#ifdef KC_RB_TREE_AUGMENTED_COMPUTE_MAX static bool tseq_compute_total(struct scoutfs_tseq_entry *ent, bool exit) { loff_t total = 1 + tseq_node_total(ent->node.rb_left) + @@ -61,17 +60,6 @@ static bool tseq_compute_total(struct scoutfs_tseq_entry *ent, bool exit) RB_DECLARE_CALLBACKS(static, tseq_rb_callbacks, struct scoutfs_tseq_entry, node, total, tseq_compute_total); -#else - -static loff_t tseq_compute_total(struct scoutfs_tseq_entry *ent) -{ - return 1 + tseq_node_total(ent->node.rb_left) + - tseq_node_total(ent->node.rb_right); -} - -RB_DECLARE_CALLBACKS(static, tseq_rb_callbacks, struct scoutfs_tseq_entry, - node, loff_t, total, tseq_compute_total); -#endif void scoutfs_tseq_tree_init(struct scoutfs_tseq_tree *tree, scoutfs_tseq_show_t show)