svn commit: r362960 - in stable/12/sys: compat/linuxkpi/common/src dev/md

[Mark Johnston]

Author: markj
Date: Mon Jul  6 13:54:44 2020
New Revision: 362960
URL: https://svnweb.freebsd.org/changeset/base/362960

Log:
  MFC r362739:
  Remove some redundant assignments and computations.

Modified:
  stable/12/sys/compat/linuxkpi/common/src/linux_page.c
  stable/12/sys/dev/md/md.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/src/linux_page.c
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/src/linux_page.c	Mon Jul  6 13:54:18 2020	(r362959)
+++ stable/12/sys/compat/linuxkpi/common/src/linux_page.c	Mon Jul  6 13:54:44 2020	(r362960)
@@ -201,7 +201,7 @@ linux_get_user_pages_internal(vm_map_t map, unsigned l
 	int i;
 
 	prot = write ? (VM_PROT_READ | VM_PROT_WRITE) : VM_PROT_READ;
-	len = ((size_t)nr_pages) << PAGE_SHIFT;
+	len = ptoa((vm_offset_t)nr_pages);
 	count = vm_fault_quick_hold_pages(map, start, len, prot, pages, nr_pages);
 	if (count == -1)
 		return (-EFAULT);
@@ -232,9 +232,8 @@ __get_user_pages_fast(unsigned long start, int nr_page
 		return (0);
 
 	MPASS(pages != NULL);
-	va = start;
 	map = &curthread->td_proc->p_vmspace->vm_map;
-	end = start + (((size_t)nr_pages) << PAGE_SHIFT);
+	end = start + ptoa((vm_offset_t)nr_pages);
 	if (!vm_map_range_valid(map, start, end))
 		return (-EINVAL);
 	prot = write ? (VM_PROT_READ | VM_PROT_WRITE) : VM_PROT_READ;

Modified: stable/12/sys/dev/md/md.c
==============================================================================
--- stable/12/sys/dev/md/md.c	Mon Jul  6 13:54:18 2020	(r362959)
+++ stable/12/sys/dev/md/md.c	Mon Jul  6 13:54:44 2020	(r362960)
@@ -1562,8 +1562,8 @@ mdresize(struct md_s *sc, struct md_req *mdr)
 		if (mdr->md_mediasize <= 0 ||
 		    (mdr->md_mediasize % PAGE_SIZE) != 0)
 			return (EDOM);
-		oldpages = OFF_TO_IDX(round_page(sc->mediasize));
-		newpages = OFF_TO_IDX(round_page(mdr->md_mediasize));
+		oldpages = OFF_TO_IDX(sc->mediasize);
+		newpages = OFF_TO_IDX(mdr->md_mediasize);
 		if (newpages < oldpages) {
 			VM_OBJECT_WLOCK(sc->object);
 			vm_object_page_remove(sc->object, newpages, 0, 0);