From patchwork Tue Nov 4 17:56:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 406730 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 09912140079 for ; Wed, 5 Nov 2014 04:57:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752281AbaKDR5K (ORCPT ); Tue, 4 Nov 2014 12:57:10 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:62510 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752117AbaKDR5A (ORCPT ); Tue, 4 Nov 2014 12:57:00 -0500 Received: by mail-pa0-f51.google.com with SMTP id kq14so14992686pab.10 for ; Tue, 04 Nov 2014 09:57:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZCk3NOX9um5NY02AArZIxn3cmbzCy76UbXyTX98D2y8=; b=Hvuav/lCpPNclOeLNJflUGIEPifgrqdZMpF7INXdzqEhW8yz1e2S4CiIAmPfodFFt7 fhgY0QVbx51c2m3gPYGfR/xeqW2Mb6N3unU2NP7gNK3rSjTCxImdcejYa0i6LNW/m0jD m8itNf8UWUFR1vGdfY8gJwr9e1dZVw8p2KFsxKuE3L4dGsauz83F+8HlkTvqWmfoQFJc 8fiFlE2SkDyS0mDiug5hG8UqjboQ+4+vTV9MCPeZBlxlNUekIG3OwwKT3OWXYzRWvGfG axneg62EtYeYLuup0hyck/8JgHqENqXEchqqI9XDF5qfVtmfpapSa9dALjv0qkQaMdRE mpgQ== X-Received: by 10.66.220.3 with SMTP id ps3mr52176579pac.8.1415123820319; Tue, 04 Nov 2014 09:57:00 -0800 (PST) Received: from localhost.net ([8.25.197.27]) by mx.google.com with ESMTPSA id n2sm1031700pdg.2.2014.11.04.09.56.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 09:56:59 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang Subject: [PATCH 13/13] net_sched: return NULL instead of ERR_PTR for qdisc_alloc() Date: Tue, 4 Nov 2014 09:56:36 -0800 Message-Id: <1415123796-8093-14-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1415123796-8093-1-git-send-email-xiyou.wangcong@gmail.com> References: <1415123796-8093-1-git-send-email-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It always returns ENOFBUFS so we can return NULL and let its callers set this errno. Signed-off-by: Cong Wang --- net/sched/sch_api.c | 4 ++-- net/sched/sch_generic.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 38c42bd..27bfd75 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -905,8 +905,8 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, goto err_out; sch = qdisc_alloc(dev_queue, ops); - if (IS_ERR(sch)) { - err = PTR_ERR(sch); + if (!sch) { + err = -ENOBUFS; goto err_out2; } diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 29db9c8..b474fbb 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -585,7 +585,6 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, void *p; struct Qdisc *sch; unsigned int size = QDISC_ALIGN(sizeof(*sch)) + ops->priv_size; - int err = -ENOBUFS; struct net_device *dev = dev_queue->dev; p = kzalloc_node(size, GFP_KERNEL, @@ -620,7 +619,7 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue, return sch; errout: - return ERR_PTR(err); + return NULL; } struct Qdisc *qdisc_create_internal(struct netdev_queue *dev_queue, @@ -633,7 +632,7 @@ struct Qdisc *qdisc_create_internal(struct netdev_queue *dev_queue, goto errout; sch = qdisc_alloc(dev_queue, ops); - if (IS_ERR(sch)) + if (!sch) goto errout; sch->parent = parentid;