BSD 4_4_Lite2 release

[unix-history] / usr / src / sys / miscfs / portal / portal_vfsops.c

diff --git a/usr/src/sys/miscfs/portal/portal_vfsops.c b/usr/src/sys/miscfs/portal/portal_vfsops.c
index dc322f3..8aff570 100644 (file)
--- a/usr/src/sys/miscfs/portal/portal_vfsops.c
+++ b/usr/src/sys/miscfs/portal/portal_vfsops.c
@@ -1,13 +1,39 @@
 /*
 /*

- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 1993, 1995

  *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *
  *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)portal_vfsops.c     8.9 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)portal_vfsops.c     8.11 (Berkeley) 5/14/95

  *
  * $Id: portal_vfsops.c,v 1.5 1992/05/30 10:25:27 jsp Exp jsp $
  */
  *
  * $Id: portal_vfsops.c,v 1.5 1992/05/30 10:25:27 jsp Exp jsp $
  */


@@ -156,7 +182,7 @@ portal_unmount(mp, mntflags, p)
        /*
         * And blow it away for future re-use
         */
        /*
         * And blow it away for future re-use
         */

-       VOP_REVOKE(rootvp, 0);
+       vgone(rootvp);

        /*
         * Shutdown the socket.  This will cause the select in the
         * daemon to wake up, and then the accept will get ECONNABORTED
        /*
         * Shutdown the socket.  This will cause the select in the
         * daemon to wake up, and then the accept will get ECONNABORTED


@@ -181,15 +207,15 @@ portal_root(mp, vpp)
        struct mount *mp;
        struct vnode **vpp;
 {
        struct mount *mp;
        struct vnode **vpp;
 {

+       struct proc *p = curproc;       /* XXX */

        struct vnode *vp;
 
        struct vnode *vp;
 

-

        /*
         * Return locked reference to root.
         */
        vp = VFSTOPORTAL(mp)->pm_root;
        VREF(vp);
        /*
         * Return locked reference to root.
         */
        vp = VFSTOPORTAL(mp)->pm_root;
        VREF(vp);

-       VOP_LOCK(vp);
+       vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);

        *vpp = vp;
        return (0);
 }
        *vpp = vp;
        return (0);
 }