Merge branch 'master' into next

This commit is contained in:
James Morris
2009-06-09 09:27:53 +10:00
353 changed files with 12683 additions and 1550 deletions

View File

@ -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)