summaryrefslogtreecommitdiffstats
path: root/sys/fs/procfs
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/fs/procfs
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/fs/procfs')
-rw-r--r--sys/fs/procfs/procfs_map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 2622d1e..5b322eb 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -83,7 +83,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
vm_map_entry_t entry, tmp_entry;
struct vnode *vp;
char *fullpath, *freepath;
- struct uidinfo *uip;
+ struct ucred *cred;
int error, vfslocked;
unsigned int last_timestamp;
#ifdef COMPAT_FREEBSD32
@@ -136,7 +136,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
if (obj->shadow_count == 1)
privateresident = obj->resident_page_count;
}
- uip = (entry->uip) ? entry->uip : (obj ? obj->uip : NULL);
+ cred = (entry->cred) ? entry->cred : (obj ? obj->cred : NULL);
resident = 0;
addr = entry->start;
@@ -221,7 +221,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
(e_eflags & MAP_ENTRY_COW)?"COW":"NCOW",
(e_eflags & MAP_ENTRY_NEEDS_COPY)?"NC":"NNC",
type, fullpath,
- uip ? "CH":"NCH", uip ? uip->ui_uid : -1);
+ cred ? "CH":"NCH", cred ? cred->cr_ruid : -1);
if (freepath != NULL)
free(freepath, M_TEMP);
OpenPOWER on IntegriCloud