From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759274AbYGNWG7 (ORCPT ); Mon, 14 Jul 2008 18:06:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757060AbYGNWCU (ORCPT ); Mon, 14 Jul 2008 18:02:20 -0400 Received: from ns.suse.de ([195.135.220.2]:49959 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757100AbYGNWCR (ORCPT ); Mon, 14 Jul 2008 18:02:17 -0400 From: Mark Fasheh To: linux-kernel@vger.kernel.org Cc: Mark Fasheh , ocfs2-devel@oss.oracle.com, Joel Becker , Louis Rilling Subject: [PATCH 12/17] configfs: Make configfs_new_dirent() return error code instead of NULL Date: Mon, 14 Jul 2008 15:01:45 -0700 Message-Id: <1216072910-27226-13-git-send-email-mfasheh@suse.com> X-Mailer: git-send-email 1.5.4.1 In-Reply-To: <1216072910-27226-1-git-send-email-mfasheh@suse.com> References: <1216072910-27226-1-git-send-email-mfasheh@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Louis Rilling This patch makes configfs_new_dirent return negative error code instead of NULL, which will be useful in the next patch to differentiate ENOMEM from ENOENT. Signed-off-by: Louis Rilling Signed-off-by: Joel Becker --- fs/configfs/dir.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index a08e5c2..918a332 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "configfs_internal.h" @@ -83,7 +84,7 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent * pare sd = kmem_cache_zalloc(configfs_dir_cachep, GFP_KERNEL); if (!sd) - return NULL; + return ERR_PTR(-ENOMEM); atomic_set(&sd->s_count, 1); INIT_LIST_HEAD(&sd->s_links); @@ -129,8 +130,8 @@ int configfs_make_dirent(struct configfs_dirent * parent_sd, struct configfs_dirent * sd; sd = configfs_new_dirent(parent_sd, element); - if (!sd) - return -ENOMEM; + if (IS_ERR(sd)) + return PTR_ERR(sd); sd->s_mode = mode; sd->s_type = type; @@ -1277,7 +1278,7 @@ static int configfs_dir_open(struct inode *inode, struct file *file) file->private_data = configfs_new_dirent(parent_sd, NULL); mutex_unlock(&dentry->d_inode->i_mutex); - return file->private_data ? 0 : -ENOMEM; + return IS_ERR(file->private_data) ? PTR_ERR(file->private_data) : 0; } -- 1.5.4.1