From 1040ffbcf8b4efdaa9bf3f46402a6f94ca746976 Mon Sep 17 00:00:00 2001
From: yan <clouds.yan@gmail.com>
Date: Thu, 4 Oct 2012 17:15:38 -0700
Subject: [PATCH] --- yaml --- r: 330158 b: refs/heads/master c:
 620727506dc6da0562fa4f6950dedb8a51bd8237 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/proc/generic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 554977c170eb..739da780d6c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aa362c49c314a98fb9aebbd7760a461667bac05
+refs/heads/master: 620727506dc6da0562fa4f6950dedb8a51bd8237
diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c
index b3647fe6a608..9e8f63164309 100644
--- a/trunk/fs/proc/generic.c
+++ b/trunk/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;
 		}