upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-19 02:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device_pager: rename the un_pager.devp.dev field to handle

Browse source 
(cherry picked from commit f0c07fe3d0007a4499f81583a99598cd0a74d45b)
This commit is contained in:
Konstantin Belousov 2024-11-05 00:10:06 +02:00
parent 6abc57ceb6
commit c57dc755fa
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/kern/kern_proc.c
View file

@ -2720,7 +2720,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags)
kve->kve_shadow_count = obj->shadow_count;
if (obj->type == OBJT_DEVICE ||
obj->type == OBJT_MGTDEVICE) {
cdev = obj->un_pager.devp.dev;
cdev = obj->un_pager.devp.handle;
if (cdev != NULL) {
csw = dev_refthread(cdev, &ref);
if (csw != NULL) {

20
sys/vm/device_pager.c
View file

@ -121,8 +121,8 @@ cdev_pager_lookup(void *handle)
again:
mtx_lock(&dev_pager_mtx);
object = vm_pager_object_lookup(&dev_pager_object_list, handle);
if (object != NULL && object->un_pager.devp.dev == NULL) {
msleep(&object->un_pager.devp.dev, &dev_pager_mtx,
if (object != NULL && object->un_pager.devp.handle == NULL) {
msleep(&object->un_pager.devp.handle, &dev_pager_mtx,
PVM | PDROP, "cdplkp", 0);
vm_object_deallocate(object);
goto again;
@ -186,8 +186,8 @@ again:
object1->type = OBJT_DEAD;
vm_object_deallocate(object1);
object1 = NULL;
if (object->un_pager.devp.dev == NULL) {
msleep(&object->un_pager.devp.dev,
if (object->un_pager.devp.handle == NULL) {
msleep(&object->un_pager.devp.handle,
&dev_pager_mtx, PVM | PDROP, "cdplkp", 0);
vm_object_deallocate(object);
goto again;
@ -221,7 +221,7 @@ again:
mtx_lock(&dev_pager_mtx);
TAILQ_REMOVE(&dev_pager_object_list, object,
pager_object_list);
wakeup(&object->un_pager.devp.dev);
wakeup(&object->un_pager.devp.handle);
mtx_unlock(&dev_pager_mtx);
object->type = OBJT_DEAD;
vm_object_deallocate(object);
@ -231,14 +231,14 @@ again:
mtx_lock(&dev_pager_mtx);
object->flags |= OBJ_COLORED;
object->pg_color = color;
object->un_pager.devp.dev = handle;
wakeup(&object->un_pager.devp.dev);
object->un_pager.devp.handle = handle;
wakeup(&object->un_pager.devp.handle);
}
}
MPASS(object1 == NULL);
} else {
if (object->un_pager.devp.dev == NULL) {
msleep(&object->un_pager.devp.dev,
if (object->un_pager.devp.handle == NULL) {
msleep(&object->un_pager.devp.handle,
&dev_pager_mtx, PVM | PDROP, "cdplkp", 0);
vm_object_deallocate(object);
goto again;
@ -292,7 +292,7 @@ dev_pager_dealloc(vm_object_t object)
vm_page_t m;
VM_OBJECT_WUNLOCK(object);
object->un_pager.devp.ops->cdev_pg_dtor(object->un_pager.devp.dev);
object->un_pager.devp.ops->cdev_pg_dtor(object->un_pager.devp.handle);
mtx_lock(&dev_pager_mtx);
TAILQ_REMOVE(&dev_pager_object_list, object, pager_object_list);

2
sys/vm/vm_object.c
View file

@ -2611,7 +2611,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only)
kvo->kvo_swapped = sp > UINT32_MAX ? UINT32_MAX : sp;
}
if (obj->type == OBJT_DEVICE || obj->type == OBJT_MGTDEVICE) {
cdev = obj->un_pager.devp.dev;
cdev = obj->un_pager.devp.handle;
if (cdev != NULL) {
csw = dev_refthread(cdev, &ref);
if (csw != NULL) {

2
sys/vm/vm_object.h
View file

@ -139,7 +139,7 @@ struct vm_object {
struct {
TAILQ_HEAD(, vm_page) devp_pglist;
const struct cdev_pager_ops *ops;
struct cdev *dev;
void *handle;
} devp;
/*