diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 14:11:45 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 14:11:45 +0800 |
commit | ceafc84623c8ef94c13a87363277a595988b2b79 (patch) | |
tree | b2513b053aedcca198dfbf2ec4c4ea64ede77cfb /fs/pstore/inode.c | |
parent | 692d96aa22dea8bb80018c6a76556ad6afd464a6 (diff) | |
parent | 87dc7c99c72e49461fba277c81871525700821fb (diff) |
Merge tag 'v3.10.68' into linux-linaro-lsk
This is the 3.10.68 stable release
Diffstat (limited to 'fs/pstore/inode.c')
-rw-r--r-- | fs/pstore/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 3ba30825f387..66c8c2fe86b7 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -178,6 +178,8 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry) if (p->psi->erase) p->psi->erase(p->type, p->id, p->count, dentry->d_inode->i_ctime, p->psi); + else + return -EPERM; return simple_unlink(dir, dentry); } @@ -334,9 +336,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); |