diff options
-rw-r--r-- | fs/proc/base.c | 4 | ||||
-rw-r--r-- | fs/proc/root.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index c384e8b84dff..acb7ef80ea4f 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -2432,7 +2432,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir, | |||
2432 | const struct pid_entry *p = ptr; | 2432 | const struct pid_entry *p = ptr; |
2433 | struct inode *inode; | 2433 | struct inode *inode; |
2434 | struct proc_inode *ei; | 2434 | struct proc_inode *ei; |
2435 | struct dentry *error = ERR_PTR(-EINVAL); | 2435 | struct dentry *error; |
2436 | 2436 | ||
2437 | /* Allocate the inode */ | 2437 | /* Allocate the inode */ |
2438 | error = ERR_PTR(-ENOMEM); | 2438 | error = ERR_PTR(-ENOMEM); |
@@ -2782,7 +2782,7 @@ out: | |||
2782 | 2782 | ||
2783 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) | 2783 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) |
2784 | { | 2784 | { |
2785 | struct dentry *result = ERR_PTR(-ENOENT); | 2785 | struct dentry *result; |
2786 | struct task_struct *task; | 2786 | struct task_struct *task; |
2787 | unsigned tgid; | 2787 | unsigned tgid; |
2788 | struct pid_namespace *ns; | 2788 | struct pid_namespace *ns; |
diff --git a/fs/proc/root.c b/fs/proc/root.c index 757c069f2a65..4258384ed22d 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -110,7 +110,6 @@ void __init proc_root_init(void) | |||
110 | if (err) | 110 | if (err) |
111 | return; | 111 | return; |
112 | proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); | 112 | proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); |
113 | err = PTR_ERR(proc_mnt); | ||
114 | if (IS_ERR(proc_mnt)) { | 113 | if (IS_ERR(proc_mnt)) { |
115 | unregister_filesystem(&proc_fs_type); | 114 | unregister_filesystem(&proc_fs_type); |
116 | return; | 115 | return; |