git: 9d4303dbe2c4 - stable/13 - rb_tree: fix stable/13 linux/rbtree.h post ABI fix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 19 Dec 2022 22:07:47 UTC
The branch stable/13 has been updated by dougm:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d4303dbe2c4a901418657ed09c9f7096756e8b3
commit 9d4303dbe2c4a901418657ed09c9f7096756e8b3
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2022-12-19 22:03:13 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2022-12-19 22:03:13 +0000
rb_tree: fix stable/13 linux/rbtree.h post ABI fix
Rearranging the left, right, and parent pointers for backward
compatibility with stable/13 in
d8a88ec381498f5942403088d28ee325b92e9a78 is incomplete because it does
not change linux/rbtree.h so that it too knows how rb_left and
rb_right are redefined. So complete it.
Reported by: jon_xyinn.org, jgibbons@protogate.org
Tested by: manu, jon_xyinn.org
Differential Revision: https://reviews.freebsd.org/D37743
---
sys/compat/linuxkpi/common/include/linux/rbtree.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h
index de21f0e4c613..bd2589392bf1 100644
--- a/sys/compat/linuxkpi/common/include/linux/rbtree.h
+++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h
@@ -41,8 +41,8 @@
struct rb_node {
RB_ENTRY(rb_node) __entry;
};
-#define rb_left __entry.rbe_link[_RB_L]
-#define rb_right __entry.rbe_link[_RB_R]
+#define rb_left __entry.rbe_link[_RB_L-1]
+#define rb_right __entry.rbe_link[_RB_R-1]
/*
* We provide a false structure that has the same bit pattern as tree.h