[src/netbsd-6]: src/sys/miscfs/kernfs Pull up following revision(s) (requeste...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/364601a4ccdc
branches:  netbsd-6
changeset: 777082:364601a4ccdc
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Aug 27 13:13:31 2016 +0000

description:
Pull up following revision(s) (requested by is in ticket #1367):
        sys/miscfs/kernfs/kernfs_vnops.c: revision 1.151
>From Ilya Zykov: Unbreak kernfs which was broken by this commit

|Make the spec_node table implementation private to spec_vnops.c.
|To retrieve a spec_node, two new lookup functions (by device or by mount)
|are implemented.  Both return a referenced vnode, for an opened block device
|the opened vnode is returned so further diagnostic checks "vp == ... sd_bdevvp"
|will not fire.  Otherwise any vnode matching the criteria gets returned.
|No objections on tech-kern.

The effect was that ls /kernfs appeared empty in most cases.

diffstat:

 sys/miscfs/kernfs/kernfs_vnops.c |  25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diffs (67 lines):

diff -r 661bc7db68d8 -r 364601a4ccdc sys/miscfs/kernfs/kernfs_vnops.c
--- a/sys/miscfs/kernfs/kernfs_vnops.c  Thu Jul 21 12:58:24 2016 +0000
+++ b/sys/miscfs/kernfs/kernfs_vnops.c  Sat Aug 27 13:13:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernfs_vnops.c,v 1.144 2011/12/12 19:11:22 njoly Exp $ */
+/*     $NetBSD: kernfs_vnops.c,v 1.144.2.1 2016/08/27 13:13:31 bouyer Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.144 2011/12/12 19:11:22 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.144.2.1 2016/08/27 13:13:31 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -63,6 +63,7 @@
 
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/kernfs/kernfs.h>
+#include <miscfs/specfs/specdev.h>
 
 #ifdef IPSEC
 #include <sys/mbuf.h>
@@ -859,6 +860,11 @@
                vap->va_bytes = vap->va_size = DEV_BSIZE;
                break;
 
+       case KFSdevice:
+               vap->va_nlink = 1;
+               vap->va_rdev = ap->a_vp->v_rdev;
+               break;
+
        case KFSroot:
                vap->va_nlink = 1;
                vap->va_bytes = vap->va_size = DEV_BSIZE;
@@ -876,7 +882,6 @@
        case KFSstring:
        case KFShostname:
        case KFSavenrun:
-       case KFSdevice:
        case KFSmsgbuf:
 #ifdef IPSEC
        case KFSipsecsa:
@@ -1050,18 +1055,8 @@
        if ((error = kernfs_allocvp(ap->a_vp->v_mount, &vp, kt->kt_tag, kt,
            value)) != 0)
                return error;
-       if (kt->kt_tag == KFSdevice) {
-               struct vattr va;
-
-               error = VOP_GETATTR(vp, &va, ap->a_cred);
-               if (error != 0) {
-                       return error;
-               }
-               d->d_fileno = va.va_fileid;
-       } else {
-               kfs = VTOKERN(vp);
-               d->d_fileno = kfs->kfs_fileno;
-       }
+       kfs = VTOKERN(vp);
+       d->d_fileno = kfs->kfs_fileno;
        vput(vp);
        return 0;
 }