Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933199AbaFQO23 (ORCPT ); Tue, 17 Jun 2014 10:28:29 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:48074 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932973AbaFQO20 (ORCPT ); Tue, 17 Jun 2014 10:28:26 -0400 Message-ID: <53A04FF7.5050900@oracle.com> Date: Tue, 17 Jun 2014 22:25:59 +0800 From: Jeff Liu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: gregkh@linuxfoundation.org CC: Christoph Lameter , Andrew Morton , Pekka Enberg , Matt Mackall , benh@kernel.crashing.org, paulus@samba.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, herbert@gondor.apana.org.au, davem@davemloft.net, stefanr@s5r6.in-berlin.de, joro@8bytes.org, jejb@parisc-linux.org, deller@gmx.de, bhelgaas@google.com, clm@fb.com, Josef Bacik , swhiteho@redhat.com, bharrosh@panasas.com, bhalevy@primarydata.com, ccaulfie@redhat.com, teigland@redhat.com, "Theodore Ts'o" , adilger.kernel@dilger.ca, jaegeuk@kernel.org, cm224.lee@samsung.com, Mark Fasheh , Joel Becker , casey@schaufler-ca.com, LKML Subject: [PATCH 01/24] kobject: return actual error on kset_create_and_add Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jie Liu It's better to return the actual error rather than NULL because kset_register() can failed due to other reasons. Cc: Christoph Lameter Cc: Greg Kroah-Hartman Cc: Andrew Morton Cc: Pekka Enberg Cc: Matt Mackall Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Herbert Xu Cc: David S. Miller Cc: Stefan Richter Cc: Joerg Roedel Cc: James E.J. Bottomley Cc: Helge Deller Cc: Bjorn Helgaas Cc: Chris Mason Cc: Josef Bacik Cc: Steven Whitehouse Cc: Boaz Harrosh Cc: Benny Halevy Cc: Christine Caulfield Cc: David Teigland Cc: Theodore Ts'o Cc: Andreas Dilger Cc: Jaegeuk Kim Cc: Changman Lee Cc: Mark Fasheh Cc: Joel Becker Cc: Casey Schaufler Signed-off-by: Jie Liu --- lib/kobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index 58751bb..538c617 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -919,11 +919,11 @@ struct kset *kset_create_and_add(const char *name, kset = kset_create(name, uevent_ops, parent_kobj); if (!kset) - return NULL; + return ERR_PTR(-ENOMEM); error = kset_register(kset); if (error) { kfree(kset); - return NULL; + return ERR_PTR(error); } return kset; } -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/