]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
pstore: d_alloc_name() doesn't return an ERR_PTR
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 14 Aug 2013 17:55:49 +0000 (10:55 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 19 Aug 2013 17:13:59 +0000 (10:13 -0700)
d_alloc_name() returns NULL on error.  Also I changed the error code
from -ENOSPC to -ENOMEM to reflect that we were short on RAM not disk
space.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
fs/pstore/inode.c

index 71bf5f4ae84c9a9044be1056e83582b7c72fd74c..6a4123d1849ca13defbdad5be25e08fddf4ce85b 100644 (file)
@@ -345,9 +345,8 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
 
        mutex_lock(&root->d_inode->i_mutex);
 
-       rc = -ENOSPC;
        dentry = d_alloc_name(root, name);
-       if (IS_ERR(dentry))
+       if (!dentry)
                goto fail_lockedalloc;
 
        memcpy(private->data, data, size);