aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-02-14 23:16:29 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-02-14 23:16:29 +0000
commit23ed568caa61b05a0b69e06b413ff6b3061bbb3b (patch)
treef953587b7259d223b756348e2b657513af279c3e /sys
parent082a6b2a92888cf799c7a0408a78e2d7ad9320bb (diff)
downloadsrc-23ed568caa61b05a0b69e06b413ff6b3061bbb3b.tar.gz
src-23ed568caa61b05a0b69e06b413ff6b3061bbb3b.zip
vm: remove no longer needed atomic_load_ptr casts
Notes
Notes: svn path=/head/; revision=357941
Diffstat (limited to 'sys')
-rw-r--r--sys/vm/vm_mmap.c3
-rw-r--r--sys/vm/vm_page.c8
-rw-r--r--sys/vm/vm_pageout.c6
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 092673c706ab..b87f7612c5e9 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -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);
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 087604d534ae..3b281d7a9e27 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -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 npages, vm_page_t m_run,
*/
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. */
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index e660a4c2552d..d045fc34329e 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -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 shortage,
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;