Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-block.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 4e8aa35fc3eb5c9387085ffa941febf0ba03b7a2..950100e326a10d2d4819e6e031ac0f7cea4c0258 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -601,29 +601,35 @@ static const struct file_operations proc_single_file_operations = {
        .release        = single_release,
 };
 
-static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+
+struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
 {
-       struct task_struct *task = get_proc_task(file_inode(file));
-       struct mm_struct *mm;
+       struct task_struct *task = get_proc_task(inode);
+       struct mm_struct *mm = ERR_PTR(-ESRCH);
 
-       if (!task)
-               return -ESRCH;
+       if (task) {
+               mm = mm_access(task, mode);
+               put_task_struct(task);
 
-       mm = mm_access(task, mode);
-       put_task_struct(task);
+               if (!IS_ERR_OR_NULL(mm)) {
+                       /* ensure this mm_struct can't be freed */
+                       atomic_inc(&mm->mm_count);
+                       /* but do not pin its memory */
+                       mmput(mm);
+               }
+       }
+
+       return mm;
+}
+
+static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
+{
+       struct mm_struct *mm = proc_mem_open(inode, mode);
 
        if (IS_ERR(mm))
                return PTR_ERR(mm);
 
-       if (mm) {
-               /* ensure this mm_struct can't be freed */
-               atomic_inc(&mm->mm_count);
-               /* but do not pin its memory */
-               mmput(mm);
-       }
-
        file->private_data = mm;
-
        return 0;
 }