diff options
| author | dim <dim@FreeBSD.org> | 2015-06-09 19:14:27 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-06-09 19:14:27 +0000 |
| commit | 6370dd4a2cfcd7b1e323f780f34523097a892d0c (patch) | |
| tree | 16a54540a7fb71a7c91fd866ad2437410acbf587 /sys/compat/linprocfs/linprocfs.c | |
| parent | 8c2b6d93700b452fac3cadba57de1b18a783ec92 (diff) | |
| parent | 8fbb8a1dd51626b81ee23212d3001e3908ff17c4 (diff) | |
| download | FreeBSD-src-6370dd4a2cfcd7b1e323f780f34523097a892d0c.zip FreeBSD-src-6370dd4a2cfcd7b1e323f780f34523097a892d0c.tar.gz | |
Merged ^/head r283871 through r284187.
Diffstat (limited to 'sys/compat/linprocfs/linprocfs.c')
| -rw-r--r-- | sys/compat/linprocfs/linprocfs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 00d0286..25a8325 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1025,20 +1025,16 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) ino = 0; if (lobj) { off = IDX_TO_OFF(lobj->size); - if (lobj->type == OBJT_VNODE) { - vp = lobj->handle; - if (vp) - vref(vp); - } - else - vp = NULL; + vp = vm_object_vnode(lobj); + if (vp != NULL) + vref(vp); if (lobj != obj) VM_OBJECT_RUNLOCK(lobj); flags = obj->flags; ref_count = obj->ref_count; shadow_count = obj->shadow_count; VM_OBJECT_RUNLOCK(obj); - if (vp) { + if (vp != NULL) { vn_fullpath(td, vp, &name, &freename); vn_lock(vp, LK_SHARED | LK_RETRY); VOP_GETATTR(vp, &vat, td->td_ucred); |
