summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-09 01:27:53 +0200
committerJames Morris <jmorris@namei.org>2009-06-09 01:27:53 +0200
commit0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch)
tree1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /fs/proc
parentintegrity: ima audit dentry_open failure (diff)
parentasync: Fix lack of boot-time console due to insufficient synchronization (diff)
downloadlinux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz
linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip
Merge branch 'master' into next
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 23342e188a66..1539e630c47d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1956,7 +1956,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir,
const struct pid_entry *p = ptr;
struct inode *inode;
struct proc_inode *ei;
- struct dentry *error = ERR_PTR(-EINVAL);
+ struct dentry *error = ERR_PTR(-ENOENT);
inode = proc_pid_make_inode(dir->i_sb, task);
if (!inode)