From patchwork Wed Feb 12 02:58:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 319489 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 065252C009C for ; Wed, 12 Feb 2014 13:58:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801AbaBLC6d (ORCPT ); Tue, 11 Feb 2014 21:58:33 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:15570 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503AbaBLC6b (ORCPT ); Tue, 11 Feb 2014 21:58:31 -0500 Received: from 172.24.2.119 (EHLO szxeml213-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BPR85461; Wed, 12 Feb 2014 10:58:23 +0800 (CST) Received: from SZXEML409-HUB.china.huawei.com (10.82.67.136) by szxeml213-edg.china.huawei.com (172.24.2.30) with Microsoft SMTP Server (TLS) id 14.3.158.1; Wed, 12 Feb 2014 10:58:22 +0800 Received: from localhost (10.177.18.231) by szxeml409-hub.china.huawei.com (10.82.67.136) with Microsoft SMTP Server id 14.3.158.1; Wed, 12 Feb 2014 10:58:18 +0800 From: Yang Yingliang To: CC: , Subject: [PATCH net-next 4/4] sch_netem: replace spin_(un)lock_bh with sch_tree_(un)lock Date: Wed, 12 Feb 2014 10:58:15 +0800 Message-ID: <1392173895-5012-5-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1392173895-5012-1-git-send-email-yangyingliang@huawei.com> References: <1392173895-5012-1-git-send-email-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.18.231] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org spin_(un)lock_bh(root_lock) is same as sch_tree_(un)lock. Signed-off-by: Yang Yingliang --- net/sched/sch_netem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 4fced67..62811d5 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -665,7 +665,6 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) struct netem_sched_data *q = qdisc_priv(sch); size_t n = nla_len(attr)/sizeof(__s16); const __s16 *data = nla_data(attr); - spinlock_t *root_lock; struct disttable *d; int i; size_t s; @@ -684,11 +683,9 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) for (i = 0; i < n; i++) d->table[i] = data[i]; - root_lock = qdisc_root_sleeping_lock(sch); - - spin_lock_bh(root_lock); + sch_tree_lock(sch); swap(q->delay_dist, d); - spin_unlock_bh(root_lock); + sch_tree_unlock(sch); dist_free(d); return 0;