Skip to content

Commit

Permalink
proc: introduce proc_mem_open()
Browse files Browse the repository at this point in the history
Extract the mm_access() code from __mem_open() into the new helper,
proc_mem_open(), the next patch will add another caller.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
oleg-nesterov authored and hnaz committed Oct 3, 2014
1 parent c0c2dc2 commit c3c040d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 15 deletions.
36 changes: 21 additions & 15 deletions fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,29 +632,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;
}

Expand Down
2 changes: 2 additions & 0 deletions fs/proc/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ struct proc_maps_private {
#endif
};

struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode);

extern const struct file_operations proc_pid_maps_operations;
extern const struct file_operations proc_tid_maps_operations;
extern const struct file_operations proc_pid_numa_maps_operations;
Expand Down

0 comments on commit c3c040d

Please sign in to comment.