diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-07 18:07:27 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-07 18:07:27 -0300 |
| commit | 945ed01c4bae06169f63978e43029c04d4abd731 (patch) | |
| tree | 5cd3ae372187bd25416aeec230f31242c3729be7 /sys/fs/procfs/procfs_map.c | |
| parent | 8aae621ec1e941b8f27411df1bace42778e61b99 (diff) | |
| parent | 36b47c3278c31b909b37616c58ccf4f148a9e47c (diff) | |
| download | FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.zip FreeBSD-src-945ed01c4bae06169f63978e43029c04d4abd731.tar.gz | |
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/fs/procfs/procfs_map.c')
| -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) |
