summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_fault.c
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2010-12-02 17:37:16 +0000
committertrasz <trasz@FreeBSD.org>2010-12-02 17:37:16 +0000
commite5fb69509c12904dfc9fb137ed1dbcafc2e86e29 (patch)
treeea2ce0208bf11af89bb5734c7f42ac4669677e31 /sys/vm/vm_fault.c
parent789892d7ed5efe3e04bd964f26650d2043686819 (diff)
downloadFreeBSD-src-e5fb69509c12904dfc9fb137ed1dbcafc2e86e29.zip
FreeBSD-src-e5fb69509c12904dfc9fb137ed1dbcafc2e86e29.tar.gz
Replace pointer to "struct uidinfo" with pointer to "struct ucred"
in "struct vm_object". This is required to make it possible to account for per-jail swap usage. Reviewed by: kib@ Tested by: pho@ Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/vm/vm_fault.c')
-rw-r--r--sys/vm/vm_fault.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 463bd1f..11489a8 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -1166,14 +1166,14 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map,
dst_entry->offset = 0;
dst_object->charge = dst_entry->end - dst_entry->start;
if (fork_charge != NULL) {
- KASSERT(dst_entry->uip == NULL,
+ KASSERT(dst_entry->cred == NULL,
("vm_fault_copy_entry: leaked swp charge"));
- dst_object->uip = curthread->td_ucred->cr_ruidinfo;
- uihold(dst_object->uip);
+ dst_object->cred = curthread->td_ucred;
+ crhold(dst_object->cred);
*fork_charge += dst_object->charge;
} else {
- dst_object->uip = dst_entry->uip;
- dst_entry->uip = NULL;
+ dst_object->cred = dst_entry->cred;
+ dst_entry->cred = NULL;
}
access = prot = dst_entry->protection;
/*
OpenPOWER on IntegriCloud