don't typedef struct lfs for now

UFS/FFS split for LFS version 1; lfs moves down one level

SCCS-vsn: sys/ufs/lfs/lfs.h 7.1
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 7.34

diff --git a/usr/src/sys/ufs/lfs/lfs.h b/usr/src/sys/ufs/lfs/lfs.h
index 2e21520..4ce3bb8 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs.h
+++ b/usr/src/sys/ufs/lfs/lfs.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs.h       5.8 (Berkeley) %G%
+ *     @(#)lfs.h       7.1 (Berkeley) %G%

  */
 
 typedef struct buf     BUF;
  */
 
 typedef struct buf     BUF;


@@ -57,7 +57,6 @@ struct segment {
 };
 
 /* On-disk and in-memory super block. */
 };
 
 /* On-disk and in-memory super block. */

-typedef struct lfs LFS;

 struct lfs {
 #define        LFS_MAGIC       0xbedead
        u_long  lfs_magic;              /* magic number */
 struct lfs {
 #define        LFS_MAGIC       0xbedead
        u_long  lfs_magic;              /* magic number */

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 7319e98..09bb459 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,10 +1,10 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * Copyright (c) 1991 Regents of the University of California.

  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *
  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_alloc.c 7.33 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 7.34 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -14,12 +14,14 @@
 #include <sys/syslog.h>
 #include <sys/mount.h>
 
 #include <sys/syslog.h>
 #include <sys/mount.h>
 

-#include <ufs/quota.h>
-#include <ufs/inode.h>
-#include <ufs/ufsmount.h>
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufsmount.h>

 
 

-#include <lfs/lfs.h>
-#include <lfs/lfs_extern.h>
+#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_extern.h>
+
+extern u_long nextgennumber;

 
 /* Allocate a new inode. */
 /* ARGSUSED */
 
 /* Allocate a new inode. */
 /* ARGSUSED */


@@ -29,7 +31,7 @@ lfs_ialloc(pip, notused, cred, ipp)
        int notused;
        UCRED *cred;
 {
        int notused;
        UCRED *cred;
 {

-       LFS *fs;
+       struct lfs *fs;

        BUF *bp;
        IFILE *ifp;
        INODE *ip;
        BUF *bp;
        IFILE *ifp;
        INODE *ip;


@@ -136,7 +138,7 @@ lfs_ifree(ip, notused1, notused2)
 {
        BUF *bp;
        IFILE *ifp;
 {
        BUF *bp;
        IFILE *ifp;

-       LFS *fs;
+       struct lfs *fs;

        ino_t ino;
 
 #ifdef ALLOCPRINT
        ino_t ino;
 
 #ifdef ALLOCPRINT