geteblk => malloc, so m_bufp => m_fs as it should be

SCCS-vsn: sys/ufs/ffs/ufsmount.h 7.2
SCCS-vsn: sys/ufs/ufs/ufsmount.h 7.2
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.4
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 7.4
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.4
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 7.4
SCCS-vsn: sys/ufs/ffs/ffs_subr.c 7.5
SCCS-vsn: sys/kern/vfs_lookup.c 7.4
SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 7.4
SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 7.4

diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index fcd5ef2..a6338e4 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -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.
  *

- *     @(#)vfs_lookup.c        7.3 (Berkeley) %G%
+ *     @(#)vfs_lookup.c        7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -634,7 +634,7 @@ found:
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)

-                       if (mount[i].m_bufp != NULL &&
+                       if (mount[i].m_fs != NULL &&

                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;
                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index d720c33..3599b82 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -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.
  *

- *     @(#)ffs_inode.c 7.3 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -134,7 +134,7 @@ loop:
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;

-                                               fs = mp->m_bufp->b_un.b_fs;
+                                               fs = mp->m_fs;

                                                ino = ROOTINO;
                                                goto loop;
                                        }
                                                ino = ROOTINO;
                                                goto loop;
                                        }

diff --git a/usr/src/sys/ufs/ffs/ffs_subr.c b/usr/src/sys/ufs/ffs/ffs_subr.c
index d5b4db9..a18a599 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_subr.c
+++ b/usr/src/sys/ufs/ffs/ffs_subr.c
@@ -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.
  *

- *     @(#)ffs_subr.c  7.4 (Berkeley) %G%
+ *     @(#)ffs_subr.c  7.5 (Berkeley) %G%

  */
 
 #ifdef KERNEL
  */
 
 #ifdef KERNEL


@@ -55,9 +55,9 @@ update()
         * of each file system is still in the buffer cache.
         */
        for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++) {
         * of each file system is still in the buffer cache.
         */
        for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++) {

-               if (mp->m_bufp == NULL || mp->m_dev == NODEV)
+               if (mp->m_fs == NULL || mp->m_dev == NODEV)

                        continue;
                        continue;

-               fs = mp->m_bufp->b_un.b_fs;
+               fs = mp->m_fs;

                if (fs->fs_fmod == 0)
                        continue;
                if (fs->fs_ronly != 0) {                /* XXX */
                if (fs->fs_fmod == 0)
                        continue;
                if (fs->fs_ronly != 0) {                /* XXX */


@@ -314,9 +314,9 @@ getfs(dev)
        register struct fs *fs;
 
        for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++) {
        register struct fs *fs;
 
        for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++) {

-               if (mp->m_bufp == NULL || mp->m_dev != dev)
+               if (mp->m_fs == NULL || mp->m_dev != dev)

                        continue;
                        continue;

-               fs = mp->m_bufp->b_un.b_fs;
+               fs = mp->m_fs;

                if (fs->fs_magic != FS_MAGIC) {
                        printf("dev = 0x%x, fs = %s\n", dev, fs->fs_fsmnt);
                        panic("getfs: bad magic");
                if (fs->fs_magic != FS_MAGIC) {
                        printf("dev = 0x%x, fs = %s\n", dev, fs->fs_fsmnt);
                        panic("getfs: bad magic");

diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index c97d867..45d977f 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -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.
  *

- *     @(#)ufs_inode.c 7.3 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -134,7 +134,7 @@ loop:
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;

-                                               fs = mp->m_bufp->b_un.b_fs;
+                                               fs = mp->m_fs;

                                                ino = ROOTINO;
                                                goto loop;
                                        }
                                                ino = ROOTINO;
                                                goto loop;
                                        }

diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c
index 0a1d604..baf817f 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ffs/ufs_lookup.c
@@ -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.
  *

- *     @(#)ufs_lookup.c        7.3 (Berkeley) %G%
+ *     @(#)ufs_lookup.c        7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -634,7 +634,7 @@ found:
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)

-                       if (mount[i].m_bufp != NULL &&
+                       if (mount[i].m_fs != NULL &&

                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;
                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;

diff --git a/usr/src/sys/ufs/ffs/ufsmount.h b/usr/src/sys/ufs/ffs/ufsmount.h
index 6826e65..7df6603 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufsmount.h
+++ b/usr/src/sys/ufs/ffs/ufsmount.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.
  *

- *     @(#)ufsmount.h  7.1 (Berkeley) %G%
+ *     @(#)ufsmount.h  7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -14,7 +14,7 @@
 struct mount
 {
        dev_t   m_dev;          /* device mounted */
 struct mount
 {
        dev_t   m_dev;          /* device mounted */

-       struct  buf *m_bufp;    /* pointer to superblock */
+       struct  fs *m_fs;       /* pointer to superblock */

        struct  inode *m_inodp; /* pointer to mounted on inode */
        struct  inode *m_qinod; /* QUOTA: pointer to quota file */
 };
        struct  inode *m_inodp; /* pointer to mounted on inode */
        struct  inode *m_qinod; /* QUOTA: pointer to quota file */
 };

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 8525d4c..b7ba1b1 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -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.
  *

- *     @(#)lfs_inode.c 7.3 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -134,7 +134,7 @@ loop:
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;

-                                               fs = mp->m_bufp->b_un.b_fs;
+                                               fs = mp->m_fs;

                                                ino = ROOTINO;
                                                goto loop;
                                        }
                                                ino = ROOTINO;
                                                goto loop;
                                        }

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index c97d867..45d977f 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -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.
  *

- *     @(#)ufs_inode.c 7.3 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -134,7 +134,7 @@ loop:
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;
                                for (mp = &mount[0]; mp < &mount[NMOUNT]; mp++)
                                        if(mp->m_inodp == ip) {
                                                dev = mp->m_dev;

-                                               fs = mp->m_bufp->b_un.b_fs;
+                                               fs = mp->m_fs;

                                                ino = ROOTINO;
                                                goto loop;
                                        }
                                                ino = ROOTINO;
                                                goto loop;
                                        }

diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c
index 0a1d604..baf817f 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ufs/ufs_lookup.c
@@ -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.
  *

- *     @(#)ufs_lookup.c        7.3 (Berkeley) %G%
+ *     @(#)ufs_lookup.c        7.4 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -634,7 +634,7 @@ found:
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)
                } else if (ndp->ni_dent.d_ino == ROOTINO &&
                   dp->i_number == ROOTINO) {
                        for (i = 1; i < NMOUNT; i++)

-                       if (mount[i].m_bufp != NULL &&
+                       if (mount[i].m_fs != NULL &&

                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;
                           mount[i].m_dev == dp->i_dev) {
                                iput(dp);
                                dp = mount[i].m_inodp;

diff --git a/usr/src/sys/ufs/ufs/ufsmount.h b/usr/src/sys/ufs/ufs/ufsmount.h
index 6826e65..7df6603 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufsmount.h
+++ b/usr/src/sys/ufs/ufs/ufsmount.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.
  *

- *     @(#)ufsmount.h  7.1 (Berkeley) %G%
+ *     @(#)ufsmount.h  7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -14,7 +14,7 @@
 struct mount
 {
        dev_t   m_dev;          /* device mounted */
 struct mount
 {
        dev_t   m_dev;          /* device mounted */

-       struct  buf *m_bufp;    /* pointer to superblock */
+       struct  fs *m_fs;       /* pointer to superblock */

        struct  inode *m_inodp; /* pointer to mounted on inode */
        struct  inode *m_qinod; /* QUOTA: pointer to quota file */
 };
        struct  inode *m_inodp; /* pointer to mounted on inode */
        struct  inode *m_qinod; /* QUOTA: pointer to quota file */
 };