diff options
| author | vangyzen <vangyzen@FreeBSD.org> | 2015-10-02 14:36:41 +0000 |
|---|---|---|
| committer | vangyzen <vangyzen@FreeBSD.org> | 2015-10-02 14:36:41 +0000 |
| commit | 8f32d0c83ec420d8944fbdbd6a323756c04c1546 (patch) | |
| tree | 50f81cbd9709385229eb7c8ec9c23fe0614e7b02 /sys/fs | |
| parent | 7b3b15b30002adb4bfb1e6836e4a76225fff3d6f (diff) | |
| download | FreeBSD-src-8f32d0c83ec420d8944fbdbd6a323756c04c1546.zip FreeBSD-src-8f32d0c83ec420d8944fbdbd6a323756c04c1546.tar.gz | |
MFC r283924
Provide vnode in memory map info for files on tmpfs
When providing memory map information to userland, populate the vnode pointer
for tmpfs files. Set the memory mapping to appear as a vnode type, to match
FreeBSD 9 behavior.
This fixes the use of tmpfs files with the dtrace pid provider,
procstat -v, procfs, linprocfs, pmc (pmcstat), and ptrace (PT_VM_ENTRY).
Submitted by: Eric Badger <eric@badgerio.us> (initial revision)
Obtained from: Dell Inc.
PR: 198431
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/procfs/procfs_map.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index eae70229..b00aac3 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -159,11 +159,11 @@ procfs_doprocmap(PFS_FILL_ARGS) freepath = NULL; fullpath = "-"; if (lobj) { + vp = NULL; switch (lobj->type) { default: case OBJT_DEFAULT: type = "default"; - vp = NULL; break; case OBJT_VNODE: type = "vnode"; @@ -171,13 +171,19 @@ procfs_doprocmap(PFS_FILL_ARGS) vref(vp); break; case OBJT_SWAP: - type = "swap"; - vp = NULL; + if ((lobj->flags & OBJ_TMPFS_NODE) != 0) { + type = "vnode"; + if ((lobj->flags & OBJ_TMPFS) != 0) { + vp = lobj->un_pager.swp.swp_tmpfs; + vref(vp); + } + } else { + type = "swap"; + } break; case OBJT_SG: case OBJT_DEVICE: type = "device"; - vp = NULL; break; } if (lobj != obj) |
