* [PATCH] pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc
@ 2008-08-27 8:59 Jarek Poplawski
2008-08-27 9:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jarek Poplawski @ 2008-08-27 8:59 UTC (permalink / raw)
To: David Miller; +Cc: netdev
pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc
These pointers are RCU protected, so proper primitives should be used.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
net/sched/sch_api.c | 2 +-
net/sched/sch_generic.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index e7fb9e0..27604e5 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -635,7 +635,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue,
if (qdisc == NULL)
qdisc = &noop_qdisc;
dev_queue->qdisc_sleeping = qdisc;
- dev_queue->qdisc = &noop_qdisc;
+ rcu_assign_pointer(dev_queue->qdisc, &noop_qdisc);
spin_unlock_bh(root_lock);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 5f0ade7..9634091 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -634,7 +634,7 @@ static void dev_deactivate_queue(struct net_device *dev,
if (!(qdisc->flags & TCQ_F_BUILTIN))
set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state);
- dev_queue->qdisc = qdisc_default;
+ rcu_assign_pointer(dev_queue->qdisc, qdisc_default);
qdisc_reset(qdisc);
spin_unlock_bh(qdisc_lock(qdisc));
@@ -709,7 +709,7 @@ static void shutdown_scheduler_queue(struct net_device *dev,
struct Qdisc *qdisc_default = _qdisc_default;
if (qdisc) {
- dev_queue->qdisc = qdisc_default;
+ rcu_assign_pointer(dev_queue->qdisc, qdisc_default);
dev_queue->qdisc_sleeping = qdisc_default;
qdisc_destroy(qdisc);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc
2008-08-27 8:59 [PATCH] pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc Jarek Poplawski
@ 2008-08-27 9:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-08-27 9:22 UTC (permalink / raw)
To: jarkao2; +Cc: netdev
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 27 Aug 2008 08:59:27 +0000
> pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc
>
> These pointers are RCU protected, so proper primitives should be used.
>
> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Looks good, applied, thanks Jarek.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-27 9:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-27 8:59 [PATCH] pkt_sched: Use rcu_assign_pointer() to change dev_queue->qdisc Jarek Poplawski
2008-08-27 9:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).