Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 14 Feb 2020 23:16:30 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r357941 - head/sys/vm
Message-ID:  <202002142316.01ENGUYm067254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mjg
Date: Fri Feb 14 23:16:29 2020
New Revision: 357941
URL: https://svnweb.freebsd.org/changeset/base/357941

Log:
  vm: remove no longer needed atomic_load_ptr casts

Modified:
  head/sys/vm/vm_mmap.c
  head/sys/vm/vm_page.c
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Fri Feb 14 23:15:41 2020	(r357940)
+++ head/sys/vm/vm_mmap.c	Fri Feb 14 23:16:29 2020	(r357941)
@@ -895,8 +895,7 @@ retry:
 				while (object == NULL || m->object != object) {
 					if (object != NULL)
 						VM_OBJECT_WUNLOCK(object);
-					object = (vm_object_t)atomic_load_ptr(
-					    &m->object);
+					object = atomic_load_ptr(&m->object);
 					if (object == NULL)
 						goto retry;
 					VM_OBJECT_WLOCK(object);

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Fri Feb 14 23:15:41 2020	(r357940)
+++ head/sys/vm/vm_page.c	Fri Feb 14 23:16:29 2020	(r357941)
@@ -2500,8 +2500,7 @@ retry:
 			    pa);
 		}
 #endif
-		else if ((object =
-		    (vm_object_t)atomic_load_ptr(&m->object)) != NULL) {
+		else if ((object = atomic_load_ptr(&m->object)) != NULL) {
 			/*
 			 * The page is considered eligible for relocation if
 			 * and only if it could be laundered or reclaimed by
@@ -2643,8 +2642,7 @@ vm_page_reclaim_run(int req_class, int domain, u_long 
 		 */
 		if (vm_page_wired(m))
 			error = EBUSY;
-		else if ((object =
-		    (vm_object_t)atomic_load_ptr(&m->object)) != NULL) {
+		else if ((object = atomic_load_ptr(&m->object)) != NULL) {
 			/*
 			 * The page is relocated if and only if it could be
 			 * laundered or reclaimed by the page daemon.
@@ -4065,7 +4063,7 @@ vm_page_release(vm_page_t m, int flags)
 
 	if ((flags & VPR_TRYFREE) != 0) {
 		for (;;) {
-			object = (vm_object_t)atomic_load_ptr(&m->object);
+			object = atomic_load_ptr(&m->object);
 			if (object == NULL)
 				break;
 			/* Depends on type-stability. */

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Fri Feb 14 23:15:41 2020	(r357940)
+++ head/sys/vm/vm_pageout.c	Fri Feb 14 23:16:29 2020	(r357941)
@@ -767,7 +767,7 @@ scan:
 		if (object == NULL || object != m->object) {
 			if (object != NULL)
 				VM_OBJECT_WUNLOCK(object);
-			object = (vm_object_t)atomic_load_ptr(&m->object);
+			object = atomic_load_ptr(&m->object);
 			if (__predict_false(object == NULL))
 				/* The page is being freed by another thread. */
 				continue;
@@ -1238,7 +1238,7 @@ act_scan:
 		 * A page's object pointer may be set to NULL before
 		 * the object lock is acquired.
 		 */
-		object = (vm_object_t)atomic_load_ptr(&m->object);
+		object = atomic_load_ptr(&m->object);
 		if (__predict_false(object == NULL))
 			/*
 			 * The page has been removed from its object.
@@ -1481,7 +1481,7 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int sh
 		if (object == NULL || object != m->object) {
 			if (object != NULL)
 				VM_OBJECT_WUNLOCK(object);
-			object = (vm_object_t)atomic_load_ptr(&m->object);
+			object = atomic_load_ptr(&m->object);
 			if (__predict_false(object == NULL))
 				/* The page is being freed by another thread. */
 				continue;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002142316.01ENGUYm067254>