BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / amd / efs_ops.c

diff --git a/usr/src/usr.sbin/amd/amd/efs_ops.c b/usr/src/usr.sbin/amd/amd/efs_ops.c
index 162ae8a..0b802bd 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/efs_ops.c
+++ b/usr/src/usr.sbin/amd/amd/efs_ops.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: efs_ops.c,v 5.2 90/06/23 22:19:23 jsp Rel $
- *

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.


@@ -9,21 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.
+ *
+ * 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.
+ *
+ *     @(#)efs_ops.c   5.3 (Berkeley) 5/12/91
+ *
+ * $Id: efs_ops.c,v 5.2.1.3 91/05/07 22:17:50 jsp Alpha $

  *
  *

- *     @(#)efs_ops.c   5.1 (Berkeley) 6/29/90

  */
 
 #include "am.h"
  */
 
 #include "am.h"


@@ -41,23 +56,22 @@
 /*
  * EFS file system always matches
  */
 /*
  * EFS file system always matches
  */

-static int efs_match(fo)
+static char *efs_match(fo)

 am_opts *fo;
 {
 am_opts *fo;
 {

-       fo->fs_mtab = strealloc(fo->fs_mtab, "(error-hook)");
-       return 1;
+       return strdup("(error-hook)");

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-static int efs_mount(mp)
-am_node *mp;
+static int efs_fmount(mf)
+mntfs *mf;

 {
        return ENOENT;
 }
 
 /*ARGSUSED*/
 {
        return ENOENT;
 }
 
 /*ARGSUSED*/

-static int efs_umount(mp)
-am_node *mp;
+static int efs_fumount(mf)
+mntfs *mf;

 {
        /*
         * Always succeed
 {
        /*
         * Always succeed


@@ -88,11 +102,12 @@ int op;
  * If we do then just give an error.
  */
 /*ARGSUSED*/
  * If we do then just give an error.
  */
 /*ARGSUSED*/

-int efs_readdir(mp, cookie, dp, ep)
+int efs_readdir(mp, cookie, dp, ep, count)

 am_node *mp;
 nfscookie cookie;
 dirlist *dp;
 entry *ep;
 am_node *mp;
 nfscookie cookie;
 dirlist *dp;
 entry *ep;

+int count;

 {
        return ESTALE;
 }
 {
        return ESTALE;
 }


@@ -104,8 +119,10 @@ am_ops efs_ops = {
        "error",
        efs_match,
        0, /* efs_init */
        "error",
        efs_match,
        0, /* efs_init */

-       efs_mount,
-       efs_umount,
+       auto_fmount,
+       efs_fmount,
+       auto_fumount,
+       efs_fumount,

        efs_lookuppn,
        efs_readdir,
        0, /* efs_readlink */
        efs_lookuppn,
        efs_readdir,
        0, /* efs_readlink */