The following commit has been merged into the locking/core branch of tip: Commit-ID: 24bf401cebfd630cc9e2c3746e43945e836626f9 Gitweb: https://git.kernel.org/tip/24bf401cebfd630cc9e2c3746e43945e836626f9 Author: Ahmed S. Darwish <a.darw...@linutronix.de> AuthorDate: Thu, 27 Aug 2020 13:40:43 +02:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Thu, 10 Sep 2020 11:19:29 +02:00
rbtree_latch: Use seqcount_latch_t Latch sequence counters have unique read and write APIs, and thus seqcount_latch_t was recently introduced at seqlock.h. Use that new data type instead of plain seqcount_t. This adds the necessary type-safety and ensures that only latching-safe seqcount APIs are to be used. Signed-off-by: Ahmed S. Darwish <a.darw...@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Link: https://lkml.kernel.org/r/20200827114044.11173-8-a.darw...@linutronix.de --- include/linux/rbtree_latch.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/rbtree_latch.h b/include/linux/rbtree_latch.h index 7d012fa..3d1a9e7 100644 --- a/include/linux/rbtree_latch.h +++ b/include/linux/rbtree_latch.h @@ -42,8 +42,8 @@ struct latch_tree_node { }; struct latch_tree_root { - seqcount_t seq; - struct rb_root tree[2]; + seqcount_latch_t seq; + struct rb_root tree[2]; }; /** @@ -206,7 +206,7 @@ latch_tree_find(void *key, struct latch_tree_root *root, do { seq = raw_read_seqcount_latch(&root->seq); node = __lt_find(key, root, seq & 1, ops->comp); - } while (read_seqcount_retry(&root->seq, seq)); + } while (read_seqcount_latch_retry(&root->seq, seq)); return node; }
