hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/madvise: reduce code duplication in error handling paths 

madvise_behavior() converts -ENOMEM to -EAGAIN in several places using
identical code.

Move that code to a common error handling path.

No functional changes.

Link: http://lkml.kernel.org/r/1564640896-1210-1-git-send-email-rppt@linux.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Pankaj Gupta <pagupta@redhat.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Rapoport 2019-09-23 15:39:31 -07:00 committed by Linus Torvalds
parent 76f3495077
commit f3bc0dba31
1 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mm/madvise.c
View File

@ -107,28 +107,14 @@ static long madvise_behavior(struct vm_area_struct *vma,
case MADV_MERGEABLE: case MADV_MERGEABLE:
case MADV_UNMERGEABLE: case MADV_UNMERGEABLE:
error = ksm_madvise(vma, start, end, behavior, &new_flags); error = ksm_madvise(vma, start, end, behavior, &new_flags);
if (error) { if (error)
/* goto out_convert_errno;
* madvise() returns EAGAIN if kernel resources, such as
* slab, are temporarily unavailable.
*/
if (error == -ENOMEM)
error = -EAGAIN;
goto out;
}
break; break;
case MADV_HUGEPAGE: case MADV_HUGEPAGE:
case MADV_NOHUGEPAGE: case MADV_NOHUGEPAGE:
error = hugepage_madvise(vma, &new_flags, behavior); error = hugepage_madvise(vma, &new_flags, behavior);
if (error) { if (error)
/* goto out_convert_errno;
* madvise() returns EAGAIN if kernel resources, such as
* slab, are temporarily unavailable.
*/
if (error == -ENOMEM)
error = -EAGAIN;
goto out;
}
break; break;
} }
@ -154,15 +140,8 @@ static long madvise_behavior(struct vm_area_struct *vma,
goto out; goto out;
} }
error = __split_vma(mm, vma, start, 1); error = __split_vma(mm, vma, start, 1);
if (error) { if (error)
/* goto out_convert_errno;
* madvise() returns EAGAIN if kernel resources, such as
* slab, are temporarily unavailable.
*/
if (error == -ENOMEM)
error = -EAGAIN;
goto out;
}
} }
if (end != vma->vm_end) { if (end != vma->vm_end) {
@ -171,15 +150,8 @@ static long madvise_behavior(struct vm_area_struct *vma,
goto out; goto out;
} }
error = __split_vma(mm, vma, end, 0); error = __split_vma(mm, vma, end, 0);
if (error) { if (error)
/* goto out_convert_errno;
* madvise() returns EAGAIN if kernel resources, such as
* slab, are temporarily unavailable.
*/
if (error == -ENOMEM)
error = -EAGAIN;
goto out;
}
} }
success: success:
@ -187,6 +159,14 @@ success:
* vm_flags is protected by the mmap_sem held in write mode. * vm_flags is protected by the mmap_sem held in write mode.
*/ */
vma->vm_flags = new_flags; vma->vm_flags = new_flags;
out_convert_errno:
/*
* madvise() returns EAGAIN if kernel resources, such as
* slab, are temporarily unavailable.
*/
if (error == -ENOMEM)
error = -EAGAIN;
out: out:
return error; return error;
} }