don't close, binval on failed mount because already mounted.

[unix-history] / usr / src / sys / ufs / ffs / ffs_subr.c

diff --git a/usr/src/sys/ufs/ffs/ffs_subr.c b/usr/src/sys/ufs/ffs/ffs_subr.c
index adb68d7..86d0173 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_subr.c
+++ b/usr/src/sys/ufs/ffs/ffs_subr.c
@@ -1,23 +1,27 @@
-/*     ffs_subr.c      6.4     84/08/09        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)ffs_subr.c  6.8 (Berkeley) %G%
+ */

 
 #ifdef KERNEL
 
 #ifdef KERNEL

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mount.h"
-#include "../h/fs.h"
-#include "../h/conf.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/quota.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "systm.h"
+#include "mount.h"
+#include "fs.h"
+#include "buf.h"
+#include "inode.h"
+#include "dir.h"
+#include "user.h"
+#include "quota.h"
+#include "kernel.h"

 #else
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/fs.h>
 #else
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/fs.h>

-#include <sys/conf.h>

 #include <sys/buf.h>
 #include <sys/inode.h>
 #include <sys/dir.h>
 #include <sys/buf.h>
 #include <sys/inode.h>
 #include <sys/dir.h>


@@ -367,3 +371,44 @@ bufstats()
        }
 }
 #endif
        }
 }
 #endif

+
+#if !defined(vax)
+/*
+ * C definitions of special vax instructions.
+ */
+scanc(size, cp, table, mask)
+       u_int size;
+       register u_char *cp, table[];
+       register u_char mask;
+{
+       register u_char *end = &cp[size];
+
+       while (cp < end && (table[*cp] & mask) == 0)
+               cp++;
+       return (end - cp);
+}
+
+skpc(mask, size, cp)
+       register u_char mask;
+       u_int size;
+       register u_char *cp;
+{
+       register u_char *end = &cp[size];
+
+       while (cp < end && *cp == mask)
+               cp++;
+       return (end - cp);
+}
+
+locc(mask, size, cp)
+       register u_char mask;
+       u_int size;
+       register u_char *cp;
+{
+       register u_char *end = &cp[size];
+
+       while (cp < end && *cp != mask)
+               cp++;
+       return (end - cp);
+}
+#endif vax