binder: simplify the return expression of binder_mmap (2a3809da) · Commits · 戴 / test

drivers/android/binder.c

+4 −14

Original line number	Diff line number	Diff line
		@@ -5180,9 +5180,7 @@ static const struct vm_operations_struct binder_vm_ops = {

		static int binder_mmap(struct file filp, struct vm_area_struct vma)
		{
		int ret;
		struct binder_proc *proc = filp->private_data;
		const char *failure_string;

		if (proc->tsk != current->group_leader)
		return -EINVAL;
		@@ -5194,9 +5192,9 @@ static int binder_mmap(struct file filp, struct vm_area_struct vma)
		(unsigned long)pgprot_val(vma->vm_page_prot));

		if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {
		ret = -EPERM;
		failure_string = "bad vm_flags";
		goto err_bad_arg;
		pr_err("%s: %d %lx-%lx %s failed %d\n", __func__,
		proc->pid, vma->vm_start, vma->vm_end, "bad vm_flags", -EPERM);
		return -EPERM;
		}
		vma->vm_flags \|= VM_DONTCOPY \| VM_MIXEDMAP;
		vma->vm_flags &= ~VM_MAYWRITE;
		@@ -5204,15 +5202,7 @@ static int binder_mmap(struct file filp, struct vm_area_struct vma)
		vma->vm_ops = &binder_vm_ops;
		vma->vm_private_data = proc;

		ret = binder_alloc_mmap_handler(&proc->alloc, vma);
		if (ret)
		return ret;
		return 0;

		err_bad_arg:
		pr_err("%s: %d %lx-%lx %s failed %d\n", __func__,
		proc->pid, vma->vm_start, vma->vm_end, failure_string, ret);
		return ret;
		return binder_alloc_mmap_handler(&proc->alloc, vma);
		}

		static int binder_open(struct inode nodp, struct file filp)