mmap locking API: use coccinelle to convert mmap_sem rwsem call sites

[linux-block.git] / fs / proc / task_nommu.c

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 7907e6419e5726702b0cd8eac2d57a5bd48306f8..a6d21fc0033c6440a48aeb9740cf05a1437eae4f 100644 (file)
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -25,7 +25,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
        struct rb_node *p;
        unsigned long bytes = 0, sbytes = 0, slack = 0, size;
         
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
 
@@ -77,7 +77,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                "Shared:\t%8lu bytes\n",
                bytes, slack, sbytes);
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
 
 unsigned long task_vsize(struct mm_struct *mm)
@@ -86,12 +86,12 @@ unsigned long task_vsize(struct mm_struct *mm)
        struct rb_node *p;
        unsigned long vsize = 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
                vsize += vma->vm_end - vma->vm_start;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return vsize;
 }
 
@@ -104,7 +104,7 @@ unsigned long task_statm(struct mm_struct *mm,
        struct rb_node *p;
        unsigned long size = kobjsize(mm);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
                size += kobjsize(vma);
@@ -119,7 +119,7 @@ unsigned long task_statm(struct mm_struct *mm,
                >> PAGE_SHIFT;
        *data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK))
                >> PAGE_SHIFT;
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        size >>= PAGE_SHIFT;
        size += *text + *data;
        *resident = size;
@@ -211,7 +211,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
        if (!mm || !mmget_not_zero(mm))
                return NULL;
 
-       if (down_read_killable(&mm->mmap_sem)) {
+       if (mmap_read_lock_killable(mm)) {
                mmput(mm);
                return ERR_PTR(-EINTR);
        }
@@ -221,7 +221,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
                if (n-- == 0)
                        return p;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
        return NULL;
 }
@@ -231,7 +231,7 @@ static void m_stop(struct seq_file *m, void *_vml)
        struct proc_maps_private *priv = m->private;
 
        if (!IS_ERR_OR_NULL(_vml)) {
-               up_read(&priv->mm->mmap_sem);
+               mmap_read_unlock(priv->mm);
                mmput(priv->mm);
        }
        if (priv->task) {