Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 388f7934 authored by Vegard Nossum's avatar Vegard Nossum Committed by Linus Torvalds
Browse files

mm: use mmget_not_zero() helper 

We already have the helper, we can convert the rest of the kernel
mechanically using:

  git grep -l 'atomic_inc_not_zero.*mm_users' | xargs sed -i 's/atomic_inc_not_zero(&\(.*\)->mm_users)/mmget_not_zero\(\1\)/'

This is needed for a later patch that hooks into the helper, but might
be a worthwhile cleanup on its own.

Link: http://lkml.kernel.org/r/20161218123229.22952-3-vegard.nossum@oracle.com


Signed-off-by: default avatarVegard Nossum <vegard.nossum@oracle.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3fce371b

drivers/gpu/drm/i915/i915_gem_userptr.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) 
			flags |= FOLL_WRITE;



		ret = -EFAULT;

		if (atomic_inc_not_zero(&mm->mm_users)) {

		if (mmget_not_zero(mm)) {

			down_read(&mm->mmap_sem);

			while (pinned < npages) {

				ret = get_user_pages_remote

drivers/iommu/intel-svm.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) 
		if (!svm->mm)

			goto bad_req;

		/* If the mm is already defunct, don't handle faults. */

		if (!atomic_inc_not_zero(&svm->mm->mm_users))

		if (!mmget_not_zero(svm->mm))

			goto bad_req;

		down_read(&svm->mm->mmap_sem);

		vma = find_extend_vma(svm->mm, address);

fs/proc/base.c

+2 −2
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf, 
		return -ENOMEM;



	copied = 0;

	if (!atomic_inc_not_zero(&mm->mm_users))

	if (!mmget_not_zero(mm))

		goto free;



	/* Maybe we should limit FOLL_FORCE to actual ptrace users? */
@@ -921,7 +921,7 @@ static ssize_t environ_read(struct file *file, char __user *buf, 
		return -ENOMEM;



	ret = 0;

	if (!atomic_inc_not_zero(&mm->mm_users))

	if (!mmget_not_zero(mm))

		goto free;



	down_read(&mm->mmap_sem);

fs/proc/task_mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos) 
		return ERR_PTR(-ESRCH);



	mm = priv->mm;

	if (!mm || !atomic_inc_not_zero(&mm->mm_users))

	if (!mm || !mmget_not_zero(mm))

		return NULL;



	down_read(&mm->mmap_sem);
@@ -1352,7 +1352,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, 
	unsigned long end_vaddr;

	int ret = 0, copied = 0;



	if (!mm || !atomic_inc_not_zero(&mm->mm_users))

	if (!mm || !mmget_not_zero(mm))

		goto out;



	ret = -EINVAL;

fs/proc/task_nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static void *m_start(struct seq_file *m, loff_t *pos) 
		return ERR_PTR(-ESRCH);



	mm = priv->mm;

	if (!mm || !atomic_inc_not_zero(&mm->mm_users))

	if (!mm || !mmget_not_zero(mm))

		return NULL;



	down_read(&mm->mmap_sem);