Skip to content

Commit

Permalink
configfs: Make configfs_new_dirent() return error code instead of NULL
Browse files Browse the repository at this point in the history
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 <Louis.Rilling@kerlabs.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
  • Loading branch information
Louis Rilling authored and Mark Fasheh committed Jul 14, 2008
1 parent 5301a77 commit 107ed40
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/configfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

}

Expand Down

0 comments on commit 107ed40

Please sign in to comment.