Commit 8fed2f3c authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds
Browse files

mm: gup: remove set but unused local variable major 

Patch series "Cleanups and fixup for gup".

This series contains cleanups to remove unneeded variable, useless BUG_ON
and use helper to improve readability.  Also we fix a potential pgmap
refcnt leak.  More details can be found in the respective changelogs.

This patch (of 5):

Since commit a2beb5f1 ("mm: clean up the last pieces of page fault
accountings"), the local variable major is unused.  Remove it.

Link: https://lkml.kernel.org/r/20210807093620.21347-1-linmiaohe@huawei.com
Link: https://lkml.kernel.org/r/20210807093620.21347-2-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6de522d1

mm/gup.c

+1 −2
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ int fixup_user_fault(struct mm_struct *mm, 
		     bool *unlocked)

{

	struct vm_area_struct *vma;

	vm_fault_t ret, major = 0;

	vm_fault_t ret;



	address = untagged_addr(address);
@@ -1296,7 +1296,6 @@ int fixup_user_fault(struct mm_struct *mm, 
		return -EINTR;



	ret = handle_mm_fault(vma, address, fault_flags, NULL);

	major |= ret & VM_FAULT_MAJOR;

	if (ret & VM_FAULT_ERROR) {

		int err = vm_fault_to_errno(ret, 0);