summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authoryan <clouds.yan@gmail.com>2012-10-04 17:15:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:05:17 +0900
commit620727506dc6da0562fa4f6950dedb8a51bd8237 (patch)
tree138a5b5f5ef6376c6a593bc99bcda8d93fb34622 /fs/proc
parent2aa362c49c314a98fb9aebbd7760a461667bac05 (diff)
downloadlinux-3.10-620727506dc6da0562fa4f6950dedb8a51bd8237.tar.gz
linux-3.10-620727506dc6da0562fa4f6950dedb8a51bd8237.tar.bz2
linux-3.10-620727506dc6da0562fa4f6950dedb8a51bd8237.zip
proc: return -ENOMEM when inode allocation failed
If proc_get_inode() returns NULL then presumably it encountered memory exhaustion. proc_lookup_de() should return -ENOMEM in this case, not -EINVAL. Signed-off-by: yan <clouds.yan@gmail.com> Cc: Ryan Mallon <rmallon@gmail.com> Cc: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index b3647fe6a60..9e8f6316430 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -427,7 +427,7 @@ struct dentry *proc_lookup_de(struct proc_dir_entry *de, struct inode *dir,
if (!memcmp(dentry->d_name.name, de->name, de->namelen)) {
pde_get(de);
spin_unlock(&proc_subdir_lock);
- error = -EINVAL;
+ error = -ENOMEM;
inode = proc_get_inode(dir->i_sb, de);
goto out_unlock;
}