working again

SCCS-vsn: sys/sys/buf.h 7.4
SCCS-vsn: sys/sys/conf.h 7.2
SCCS-vsn: sys/ufs/ffs/fs.h 7.3

diff --git a/usr/src/sys/sys/buf.h b/usr/src/sys/sys/buf.h
index 21f9886..27f69df 100644 (file)
--- a/usr/src/sys/sys/buf.h
+++ b/usr/src/sys/sys/buf.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)buf.h       7.3.1.1 (Berkeley) %G%
+ *     @(#)buf.h       7.4 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/sys/sys/conf.h b/usr/src/sys/sys/conf.h
index 661ae81..d41cbc1 100644 (file)
--- a/usr/src/sys/sys/conf.h
+++ b/usr/src/sys/sys/conf.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)conf.h      7.1.1.1 (Berkeley) %G%
+ *     @(#)conf.h      7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -21,6 +21,7 @@ struct bdevsw
        int     (*d_close)();
        int     (*d_strategy)();
        int     (*d_ioctl)();
        int     (*d_close)();
        int     (*d_strategy)();
        int     (*d_ioctl)();

+       int     (*d_ioctl)();

        int     (*d_dump)();
        int     (*d_psize)();
        int     d_flags;
        int     (*d_dump)();
        int     (*d_psize)();
        int     d_flags;

diff --git a/usr/src/sys/ufs/ffs/fs.h b/usr/src/sys/ufs/ffs/fs.h
index f4a1324..7f9ea05 100644 (file)
--- a/usr/src/sys/ufs/ffs/fs.h
+++ b/usr/src/sys/ufs/ffs/fs.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)fs.h        7.2.1.1 (Berkeley) %G%
+ *     @(#)fs.h        7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -29,11 +29,14 @@
  *
  * The first boot and super blocks are given in absolute disk addresses.
  * The byte-offset forms are preferred, as they don't imply a sector size.
  *
  * The first boot and super blocks are given in absolute disk addresses.
  * The byte-offset forms are preferred, as they don't imply a sector size.

+ * The byte-offset forms are preferred, as they don't imply a sector size.

  */
 #define BBSIZE         8192
 #define SBSIZE         8192
 #define        BBOFF           ((off_t)(0))
 #define        SBOFF           ((off_t)(BBOFF + BBSIZE))
  */
 #define BBSIZE         8192
 #define SBSIZE         8192
 #define        BBOFF           ((off_t)(0))
 #define        SBOFF           ((off_t)(BBOFF + BBSIZE))

+#define        BBOFF           ((off_t)(0))
+#define        SBOFF           ((off_t)(BBOFF + BBSIZE))

 #ifndef SECSIZE
 #define        BBLOCK          ((daddr_t)(0))
 #define        SBLOCK          ((daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))
 #ifndef SECSIZE
 #define        BBLOCK          ((daddr_t)(0))
 #define        SBLOCK          ((daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))