From patchwork Wed Feb 23 19:06:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 84234 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 B8989B71D2 for ; Thu, 24 Feb 2011 06:53:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932300Ab1BWTxO (ORCPT ); Wed, 23 Feb 2011 14:53:14 -0500 Received: from suva.vyatta.com ([76.74.103.44]:44644 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562Ab1BWTxC (ORCPT ); Wed, 23 Feb 2011 14:53:02 -0500 X-Greylist: delayed 2682 seconds by postgrey-1.27 at vger.kernel.org; Wed, 23 Feb 2011 14:53:00 EST Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id p1NJ8B3H004778; Wed, 23 Feb 2011 11:08:12 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id p1NJ8BYI004777; Wed, 23 Feb 2011 11:08:11 -0800 Message-Id: <20110223190701.144705172@vyatta.com> User-Agent: quilt/0.48-1 Date: Wed, 23 Feb 2011 11:06:51 -0800 From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH 4/5] mqprio: cleanups References: <20110223190647.482444598@vyatta.com> Content-Disposition: inline; filename=mqprio-sparse.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org * make qdisc_ops local * add sparse annotation about expected unlock/unlock in dump_class_stats * fix indentation Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/sched/sch_mqprio.c 2011-02-23 10:22:17.171259588 -0800 +++ b/net/sched/sch_mqprio.c 2011-02-23 10:28:51.955835730 -0800 @@ -311,7 +311,9 @@ static int mqprio_dump_class(struct Qdis } static int mqprio_dump_class_stats(struct Qdisc *sch, unsigned long cl, - struct gnet_dump *d) + struct gnet_dump *d) + __releases(d->lock) + __acquires(d->lock) { struct net_device *dev = qdisc_dev(sch); @@ -389,7 +391,7 @@ static const struct Qdisc_class_ops mqpr .dump_stats = mqprio_dump_class_stats, }; -struct Qdisc_ops mqprio_qdisc_ops __read_mostly = { +static struct Qdisc_ops mqprio_qdisc_ops __read_mostly = { .cl_ops = &mqprio_class_ops, .id = "mqprio", .priv_size = sizeof(struct mqprio_sched),