diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2010-02-22 07:57:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-22 15:45:54 -0800 |
| commit | 1cc523271ef0b6305c565a143e3d48f6fff826dd (patch) | |
| tree | 8acfcce42d5d81e4ce993c078985bfc3789bf2c5 /include | |
| parent | 35e2da46d25a53e0e19956f533cc29272a6cceb2 (diff) | |
| download | op-kernel-dev-1cc523271ef0b6305c565a143e3d48f6fff826dd.zip op-kernel-dev-1cc523271ef0b6305c565a143e3d48f6fff826dd.tar.gz | |
seq_file: add RCU versions of new hlist/list iterators (v3)
Many usages of seq_file use RCU protected lists, so non RCU
iterators will not work safely.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rculist.h | 5 | ||||
| -rw-r--r-- | include/linux/seq_file.h | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/linux/rculist.h b/include/linux/rculist.h index 1bf0f70..701fe9c 100644 --- a/include/linux/rculist.h +++ b/include/linux/rculist.h @@ -406,6 +406,11 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev, n->next->pprev = &n->next; } +#define __hlist_for_each_rcu(pos, head) \ + for (pos = rcu_dereference((head)->first); \ + pos && ({ prefetch(pos->next); 1; }); \ + pos = rcu_dereference(pos->next)) + /** * hlist_for_each_entry_rcu - iterate over rcu list of given type * @tpos: the type * to use as a loop cursor. diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index c95bcdc..03c0232 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h @@ -140,10 +140,17 @@ extern struct list_head *seq_list_next(void *v, struct list_head *head, */ extern struct hlist_node *seq_hlist_start(struct hlist_head *head, - loff_t pos); + loff_t pos); extern struct hlist_node *seq_hlist_start_head(struct hlist_head *head, - loff_t pos); + loff_t pos); extern struct hlist_node *seq_hlist_next(void *v, struct hlist_head *head, - loff_t *ppos); - + loff_t *ppos); + +extern struct hlist_node *seq_hlist_start_rcu(struct hlist_head *head, + loff_t pos); +extern struct hlist_node *seq_hlist_start_head_rcu(struct hlist_head *head, + loff_t pos); +extern struct hlist_node *seq_hlist_next_rcu(void *v, + struct hlist_head *head, + loff_t *ppos); #endif |
