diff options
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 7761602af9de..f6299a25594e 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/bitops.h> | 18 | #include <linux/bitops.h> |
| 19 | #include <linux/smp_lock.h> | ||
| 20 | #include <linux/mount.h> | 19 | #include <linux/mount.h> |
| 21 | #include <linux/pid_namespace.h> | 20 | #include <linux/pid_namespace.h> |
| 22 | 21 | ||
| @@ -162,17 +161,12 @@ static int proc_root_readdir(struct file * filp, | |||
| 162 | unsigned int nr = filp->f_pos; | 161 | unsigned int nr = filp->f_pos; |
| 163 | int ret; | 162 | int ret; |
| 164 | 163 | ||
| 165 | lock_kernel(); | ||
| 166 | |||
| 167 | if (nr < FIRST_PROCESS_ENTRY) { | 164 | if (nr < FIRST_PROCESS_ENTRY) { |
| 168 | int error = proc_readdir(filp, dirent, filldir); | 165 | int error = proc_readdir(filp, dirent, filldir); |
| 169 | if (error <= 0) { | 166 | if (error <= 0) |
| 170 | unlock_kernel(); | ||
| 171 | return error; | 167 | return error; |
| 172 | } | ||
| 173 | filp->f_pos = FIRST_PROCESS_ENTRY; | 168 | filp->f_pos = FIRST_PROCESS_ENTRY; |
| 174 | } | 169 | } |
| 175 | unlock_kernel(); | ||
| 176 | 170 | ||
| 177 | ret = proc_pid_readdir(filp, dirent, filldir); | 171 | ret = proc_pid_readdir(filp, dirent, filldir); |
| 178 | return ret; | 172 | return ret; |
