| .. | .. |
|---|
| 25 | 25 | struct rb_node *p; |
|---|
| 26 | 26 | unsigned long bytes = 0, sbytes = 0, slack = 0, size; |
|---|
| 27 | 27 | |
|---|
| 28 | | - down_read(&mm->mmap_sem); |
|---|
| 28 | + mmap_read_lock(mm); |
|---|
| 29 | 29 | for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) { |
|---|
| 30 | 30 | vma = rb_entry(p, struct vm_area_struct, vm_rb); |
|---|
| 31 | 31 | |
|---|
| .. | .. |
|---|
| 64 | 64 | else |
|---|
| 65 | 65 | bytes += kobjsize(current->files); |
|---|
| 66 | 66 | |
|---|
| 67 | | - if (current->sighand && atomic_read(¤t->sighand->count) > 1) |
|---|
| 67 | + if (current->sighand && refcount_read(¤t->sighand->count) > 1) |
|---|
| 68 | 68 | sbytes += kobjsize(current->sighand); |
|---|
| 69 | 69 | else |
|---|
| 70 | 70 | bytes += kobjsize(current->sighand); |
|---|
| .. | .. |
|---|
| 77 | 77 | "Shared:\t%8lu bytes\n", |
|---|
| 78 | 78 | bytes, slack, sbytes); |
|---|
| 79 | 79 | |
|---|
| 80 | | - up_read(&mm->mmap_sem); |
|---|
| 80 | + mmap_read_unlock(mm); |
|---|
| 81 | 81 | } |
|---|
| 82 | 82 | |
|---|
| 83 | 83 | unsigned long task_vsize(struct mm_struct *mm) |
|---|
| .. | .. |
|---|
| 86 | 86 | struct rb_node *p; |
|---|
| 87 | 87 | unsigned long vsize = 0; |
|---|
| 88 | 88 | |
|---|
| 89 | | - down_read(&mm->mmap_sem); |
|---|
| 89 | + mmap_read_lock(mm); |
|---|
| 90 | 90 | for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) { |
|---|
| 91 | 91 | vma = rb_entry(p, struct vm_area_struct, vm_rb); |
|---|
| 92 | 92 | vsize += vma->vm_end - vma->vm_start; |
|---|
| 93 | 93 | } |
|---|
| 94 | | - up_read(&mm->mmap_sem); |
|---|
| 94 | + mmap_read_unlock(mm); |
|---|
| 95 | 95 | return vsize; |
|---|
| 96 | 96 | } |
|---|
| 97 | 97 | |
|---|
| .. | .. |
|---|
| 104 | 104 | struct rb_node *p; |
|---|
| 105 | 105 | unsigned long size = kobjsize(mm); |
|---|
| 106 | 106 | |
|---|
| 107 | | - down_read(&mm->mmap_sem); |
|---|
| 107 | + mmap_read_lock(mm); |
|---|
| 108 | 108 | for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) { |
|---|
| 109 | 109 | vma = rb_entry(p, struct vm_area_struct, vm_rb); |
|---|
| 110 | 110 | size += kobjsize(vma); |
|---|
| .. | .. |
|---|
| 119 | 119 | >> PAGE_SHIFT; |
|---|
| 120 | 120 | *data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK)) |
|---|
| 121 | 121 | >> PAGE_SHIFT; |
|---|
| 122 | | - up_read(&mm->mmap_sem); |
|---|
| 122 | + mmap_read_unlock(mm); |
|---|
| 123 | 123 | size >>= PAGE_SHIFT; |
|---|
| 124 | 124 | size += *text + *data; |
|---|
| 125 | 125 | *resident = size; |
|---|
| .. | .. |
|---|
| 178 | 178 | seq_file_path(m, file, ""); |
|---|
| 179 | 179 | } else if (mm && is_stack(vma)) { |
|---|
| 180 | 180 | seq_pad(m, ' '); |
|---|
| 181 | | - seq_printf(m, "[stack]"); |
|---|
| 181 | + seq_puts(m, "[stack]"); |
|---|
| 182 | 182 | } |
|---|
| 183 | 183 | |
|---|
| 184 | 184 | seq_putc(m, '\n'); |
|---|
| .. | .. |
|---|
| 208 | 208 | return ERR_PTR(-ESRCH); |
|---|
| 209 | 209 | |
|---|
| 210 | 210 | mm = priv->mm; |
|---|
| 211 | | - if (!mm || !mmget_not_zero(mm)) |
|---|
| 211 | + if (!mm || !mmget_not_zero(mm)) { |
|---|
| 212 | + put_task_struct(priv->task); |
|---|
| 213 | + priv->task = NULL; |
|---|
| 212 | 214 | return NULL; |
|---|
| 215 | + } |
|---|
| 213 | 216 | |
|---|
| 214 | | - if (down_read_killable(&mm->mmap_sem)) { |
|---|
| 217 | + if (mmap_read_lock_killable(mm)) { |
|---|
| 215 | 218 | mmput(mm); |
|---|
| 219 | + put_task_struct(priv->task); |
|---|
| 220 | + priv->task = NULL; |
|---|
| 216 | 221 | return ERR_PTR(-EINTR); |
|---|
| 217 | 222 | } |
|---|
| 218 | 223 | |
|---|
| .. | .. |
|---|
| 221 | 226 | if (n-- == 0) |
|---|
| 222 | 227 | return p; |
|---|
| 223 | 228 | |
|---|
| 224 | | - up_read(&mm->mmap_sem); |
|---|
| 225 | | - mmput(mm); |
|---|
| 226 | 229 | return NULL; |
|---|
| 227 | 230 | } |
|---|
| 228 | 231 | |
|---|
| 229 | | -static void m_stop(struct seq_file *m, void *_vml) |
|---|
| 232 | +static void m_stop(struct seq_file *m, void *v) |
|---|
| 230 | 233 | { |
|---|
| 231 | 234 | struct proc_maps_private *priv = m->private; |
|---|
| 235 | + struct mm_struct *mm = priv->mm; |
|---|
| 232 | 236 | |
|---|
| 233 | | - if (!IS_ERR_OR_NULL(_vml)) { |
|---|
| 234 | | - up_read(&priv->mm->mmap_sem); |
|---|
| 235 | | - mmput(priv->mm); |
|---|
| 236 | | - } |
|---|
| 237 | | - if (priv->task) { |
|---|
| 238 | | - put_task_struct(priv->task); |
|---|
| 239 | | - priv->task = NULL; |
|---|
| 240 | | - } |
|---|
| 237 | + if (!priv->task) |
|---|
| 238 | + return; |
|---|
| 239 | + |
|---|
| 240 | + mmap_read_unlock(mm); |
|---|
| 241 | + mmput(mm); |
|---|
| 242 | + put_task_struct(priv->task); |
|---|
| 243 | + priv->task = NULL; |
|---|
| 241 | 244 | } |
|---|
| 242 | 245 | |
|---|
| 243 | 246 | static void *m_next(struct seq_file *m, void *_p, loff_t *pos) |
|---|