[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0808190806120.4551@wrl-59.cs.helsinki.fi>
Date: Tue, 19 Aug 2008 08:27:37 +0300 (EEST)
From: "Ilpo Järvinen" <ilpo.jarvinen@...sinki.fi>
To: David Miller <davem@...emloft.net>
cc: Herbert Xu <herbert@...dor.apana.org.au>, jarkao2@...il.com,
Netdev <netdev@...r.kernel.org>, denys@...p.net.lb
Subject: Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
On Mon, 18 Aug 2008, David Miller wrote:
> From: David Miller <davem@...emloft.net>
> Date: Mon, 18 Aug 2008 17:11:24 -0700 (PDT)
>
> Ok, here it is. I'll push this out to net-2.6 after I do
> some testing here.
>
> pkt_sched: Don't hold qdisc lock over qdisc_destroy().
...snip...
> @@ -1092,16 +1089,10 @@ create_n_graft:
>
> graft:
> if (1) {
> - spinlock_t *root_lock;
> -
> err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
After this the block became unnecessary...
--
i.
--
[PATCH] pkt_sched: remove bogus block (cleanup)
...Last block local var got just deleted.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@...sinki.fi>
---
net/sched/sch_api.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index d91a233..9372ec4 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1088,14 +1088,13 @@ create_n_graft:
}
graft:
- if (1) {
- err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
- if (err) {
- if (q)
- qdisc_destroy(q);
- return err;
- }
+ err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
+ if (err) {
+ if (q)
+ qdisc_destroy(q);
+ return err;
}
+
return 0;
}
--
1.5.2.2
Powered by blists - more mailing lists