From a86cfb30e5c83692a56868f9105c4888a6c69a61 Mon Sep 17 00:00:00 2001
From: Louis Rilling <Louis.Rilling@kerlabs.com>
Date: Mon, 16 Jun 2008 19:01:00 +0200
Subject: [PATCH] --- yaml --- r: 102339 b: refs/heads/master c:
 107ed40bd070df5e4a0a012042c45c40963dc574 h: refs/heads/master i:   102337:
 c2d443dededb25ac81245856c68ba69e4c532d5d   102335:
 f98d4f8c78aa45516e48d1f3e20421967791d71f v: v3

---
 [refs]                  | 2 +-
 trunk/fs/configfs/dir.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 11288aa9f928..6b4d278d9020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5301a77da2da1e4c22573e0e8d394a653b8ad9f9
+refs/heads/master: 107ed40bd070df5e4a0a012042c45c40963dc574
diff --git a/trunk/fs/configfs/dir.c b/trunk/fs/configfs/dir.c
index a08e5c2f25e8..918a332babfe 100644
--- a/trunk/fs/configfs/dir.c
+++ b/trunk/fs/configfs/dir.c
@@ -30,6 +30,7 @@
 #include <linux/mount.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/err.h>
 
 #include <linux/configfs.h>
 #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;
 
 }