statfs.f_bsize => statfs.f_iosize; statfs.f_fsize => statfs.f_bsize (for SunOS)

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

diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c
index f89ad76..124a0ca 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ffs/ufs_lookup.c
@@ -4,20 +4,28 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_lookup.c        7.25 (Berkeley) %G%
+ *     @(#)ufs_lookup.c        7.36 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "user.h"
-#include "buf.h"
-#include "file.h"
-#include "vnode.h"
-#include "../ufs/quota.h"
-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
+#include <sys/param.h>
+#include <sys/namei.h>
+#include <sys/buf.h>
+#include <sys/file.h>
+#include <sys/mount.h>
+#include <sys/vnode.h>
+
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/ufs_extern.h>

 
 struct nchstats nchstats;
 
 struct nchstats nchstats;

+#ifdef DIAGNOSTIC

 int    dirchk = 1;
 int    dirchk = 1;

+#else
+int    dirchk = 0;
+#endif

 
 /*
  * Convert a component of a pathname into a pointer to a locked inode.
 
 /*
  * Convert a component of a pathname into a pointer to a locked inode.


@@ -54,35 +62,38 @@ int dirchk = 1;
  *
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */
  *
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */

-ufs_lookup(vdp, ndp)
+int
+ufs_lookup(vdp, ndp, p)

        register struct vnode *vdp;
        register struct nameidata *ndp;
        register struct vnode *vdp;
        register struct nameidata *ndp;

+       struct proc *p;

 {
        register struct inode *dp;      /* the directory we are searching */
 {
        register struct inode *dp;      /* the directory we are searching */

-       register struct fs *fs;         /* file system that directory is in */
-       struct buf *bp = 0;             /* a buffer of directory entries */
+       struct buf *bp;                 /* a buffer of directory entries */

        register struct direct *ep;     /* the current directory entry */
        int entryoffsetinblock;         /* offset of ep in bp's buffer */
        enum {NONE, COMPACT, FOUND} slotstatus;
        register struct direct *ep;     /* the current directory entry */
        int entryoffsetinblock;         /* offset of ep in bp's buffer */
        enum {NONE, COMPACT, FOUND} slotstatus;

-       int slotoffset = -1;            /* offset of area with free space */
+       int slotoffset;                 /* offset of area with free space */

        int slotsize;                   /* size of area at slotoffset */
        int slotfreespace;              /* amount of space free in slot */
        int slotneeded;                 /* size of the entry we're seeking */
        int numdirpasses;               /* strategy for directory search */
        int endsearch;                  /* offset to end directory search */
        int slotsize;                   /* size of area at slotoffset */
        int slotfreespace;              /* amount of space free in slot */
        int slotneeded;                 /* size of the entry we're seeking */
        int numdirpasses;               /* strategy for directory search */
        int endsearch;                  /* offset to end directory search */

-       int prevoff;                    /* ndp->ni_offset of previous entry */
+       int prevoff;                    /* prev entry ndp->ni_ufs.ufs_offset */

        struct inode *pdp;              /* saved dp during symlink work */
        struct inode *pdp;              /* saved dp during symlink work */

-       struct inode *tdp;              /* returned by iget */
+       struct vnode *tdp;              /* returned by VOP_VGET */

        off_t enduseful;                /* pointer past last used dir slot */
        off_t enduseful;                /* pointer past last used dir slot */

+       u_long bmask;                   /* block offset mask */

        int flag;                       /* LOOKUP, CREATE, RENAME, or DELETE */
        int lockparent;                 /* 1 => lockparent flag is set */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int error;
 
        int flag;                       /* LOOKUP, CREATE, RENAME, or DELETE */
        int lockparent;                 /* 1 => lockparent flag is set */
        int wantparent;                 /* 1 => wantparent or lockparent flag */
        int error;
 

+       bp = NULL;
+       slotoffset = -1;

        ndp->ni_dvp = vdp;
        ndp->ni_vp = NULL;
        dp = VTOI(vdp);
        ndp->ni_dvp = vdp;
        ndp->ni_vp = NULL;
        dp = VTOI(vdp);

-       fs = dp->i_fs;

        lockparent = ndp->ni_nameiop & LOCKPARENT;
        flag = ndp->ni_nameiop & OPMASK;
        wantparent = ndp->ni_nameiop & (LOCKPARENT|WANTPARENT);
        lockparent = ndp->ni_nameiop & LOCKPARENT;
        flag = ndp->ni_nameiop & OPMASK;
        wantparent = ndp->ni_nameiop & (LOCKPARENT|WANTPARENT);


@@ -92,7 +103,7 @@ ufs_lookup(vdp, ndp)
         */
        if ((dp->i_mode&IFMT) != IFDIR)
                return (ENOTDIR);
         */
        if ((dp->i_mode&IFMT) != IFDIR)
                return (ENOTDIR);

-       if (error = ufs_access(vdp, VEXEC, ndp->ni_cred))
+       if (error = ufs_access(vdp, VEXEC, ndp->ni_cred, p))

                return (error);
 
        /*
                return (error);
 
        /*


@@ -126,9 +137,12 @@ ufs_lookup(vdp, ndp)
                } else if (ndp->ni_isdotdot) {
                        IUNLOCK(pdp);
                        error = vget(vdp);
                } else if (ndp->ni_isdotdot) {
                        IUNLOCK(pdp);
                        error = vget(vdp);

+                       if (!error && lockparent && *ndp->ni_next == '\0')
+                               ILOCK(pdp);

                } else {
                        error = vget(vdp);
                } else {
                        error = vget(vdp);

-                       IUNLOCK(pdp);
+                       if (!lockparent || error || *ndp->ni_next != '\0')
+                               IUNLOCK(pdp);

                }
                /*
                 * Check that the capability number did not change
                }
                /*
                 * Check that the capability number did not change


@@ -137,8 +151,9 @@ ufs_lookup(vdp, ndp)
                if (!error) {
                        if (vpid == vdp->v_id)
                                return (0);
                if (!error) {
                        if (vpid == vdp->v_id)
                                return (0);

-                       else
-                               iput(dp);
+                       ufs_iput(dp);
+                       if (lockparent && pdp != dp && *ndp->ni_next == '\0')
+                               IUNLOCK(pdp);

                }
                ILOCK(pdp);
                dp = pdp;
                }
                ILOCK(pdp);
                dp = pdp;


@@ -156,7 +171,8 @@ ufs_lookup(vdp, ndp)
        if ((flag == CREATE || flag == RENAME) && *ndp->ni_next == 0) {
                slotstatus = NONE;
                slotfreespace = 0;
        if ((flag == CREATE || flag == RENAME) && *ndp->ni_next == 0) {
                slotstatus = NONE;
                slotfreespace = 0;

-               slotneeded = DIRSIZ(&ndp->ni_dent);
+               slotneeded = ((sizeof (struct direct) - (MAXNAMLEN + 1)) +
+                       ((ndp->ni_namelen + 1 + 3) &~ 3));

        }
 
        /*
        }
 
        /*


@@ -170,17 +186,16 @@ ufs_lookup(vdp, ndp)
         * profiling time and hence has been removed in the interest
         * of simplicity.
         */
         * profiling time and hence has been removed in the interest
         * of simplicity.
         */

+       bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;

        if (flag != LOOKUP || dp->i_diroff == 0 || dp->i_diroff > dp->i_size) {
        if (flag != LOOKUP || dp->i_diroff == 0 || dp->i_diroff > dp->i_size) {

-               ndp->ni_offset = 0;
+               ndp->ni_ufs.ufs_offset = 0;

                numdirpasses = 1;
        } else {
                numdirpasses = 1;
        } else {

-               ndp->ni_offset = dp->i_diroff;
-               entryoffsetinblock = blkoff(fs, ndp->ni_offset);
-               if (entryoffsetinblock != 0) {
-                       error = blkatoff(dp, ndp->ni_offset, (char **)0, &bp);
-                       if (error)
-                               return (error);
-               }
+               ndp->ni_ufs.ufs_offset = dp->i_diroff;
+               if ((entryoffsetinblock = ndp->ni_ufs.ufs_offset & bmask) &&
+                   (error = VOP_BLKATOFF(vdp, ndp->ni_ufs.ufs_offset, NULL,
+                    &bp)))
+                       return (error);

                numdirpasses = 2;
                nchstats.ncs_2passes++;
        }
                numdirpasses = 2;
                nchstats.ncs_2passes++;
        }


@@ -188,17 +203,16 @@ ufs_lookup(vdp, ndp)
        enduseful = 0;
 
 searchloop:
        enduseful = 0;
 
 searchloop:

-       while (ndp->ni_offset < endsearch) {
+       while (ndp->ni_ufs.ufs_offset < endsearch) {

                /*
                /*

-                * If offset is on a block boundary,
-                * read the next directory block.
-                * Release previous if it exists.
+                * If offset is on a block boundary, read the next directory
+                * block.  Release previous if it exists.

                 */
                 */

-               if (blkoff(fs, ndp->ni_offset) == 0) {
+               if ((ndp->ni_ufs.ufs_offset & bmask) == 0) {

                        if (bp != NULL)
                                brelse(bp);
                        if (bp != NULL)
                                brelse(bp);

-                       error = blkatoff(dp, ndp->ni_offset, (char **)0, &bp);
-                       if (error)
+                       if (error = VOP_BLKATOFF(vdp, ndp->ni_ufs.ufs_offset,
+                           NULL, &bp))

                                return (error);
                        entryoffsetinblock = 0;
                }
                                return (error);
                        entryoffsetinblock = 0;
                }


@@ -220,12 +234,12 @@ searchloop:
                 */
                ep = (struct direct *)(bp->b_un.b_addr + entryoffsetinblock);
                if (ep->d_reclen == 0 ||
                 */
                ep = (struct direct *)(bp->b_un.b_addr + entryoffsetinblock);
                if (ep->d_reclen == 0 ||

-                   dirchk && dirbadentry(ep, entryoffsetinblock)) {
+                   dirchk && ufs_dirbadentry(ep, entryoffsetinblock)) {

                        int i;
 
                        int i;
 

-                       dirbad(dp, ndp->ni_offset, "mangled entry");
+                       ufs_dirbad(dp, ndp->ni_ufs.ufs_offset, "mangled entry");

                        i = DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1));
                        i = DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1));

-                       ndp->ni_offset += i;
+                       ndp->ni_ufs.ufs_offset += i;

                        entryoffsetinblock += i;
                        continue;
                }
                        entryoffsetinblock += i;
                        continue;
                }


@@ -244,15 +258,17 @@ searchloop:
                        if (size > 0) {
                                if (size >= slotneeded) {
                                        slotstatus = FOUND;
                        if (size > 0) {
                                if (size >= slotneeded) {
                                        slotstatus = FOUND;

-                                       slotoffset = ndp->ni_offset;
+                                       slotoffset = ndp->ni_ufs.ufs_offset;

                                        slotsize = ep->d_reclen;
                                } else if (slotstatus == NONE) {
                                        slotfreespace += size;
                                        if (slotoffset == -1)
                                        slotsize = ep->d_reclen;
                                } else if (slotstatus == NONE) {
                                        slotfreespace += size;
                                        if (slotoffset == -1)

-                                               slotoffset = ndp->ni_offset;
+                                               slotoffset =
+                                                     ndp->ni_ufs.ufs_offset;

                                        if (slotfreespace >= slotneeded) {
                                                slotstatus = COMPACT;
                                        if (slotfreespace >= slotneeded) {
                                                slotstatus = COMPACT;

-                                               slotsize = ndp->ni_offset +
+                                               slotsize =
+                                                     ndp->ni_ufs.ufs_offset +

                                                      ep->d_reclen - slotoffset;
                                        }
                                }
                                                      ep->d_reclen - slotoffset;
                                        }
                                }


@@ -263,25 +279,25 @@ searchloop:
                 * Check for a name match.
                 */
                if (ep->d_ino) {
                 * Check for a name match.
                 */
                if (ep->d_ino) {

-                       if (ep->d_namlen == ndp->ni_dent.d_namlen &&
+                       if (ep->d_namlen == ndp->ni_namelen &&

                            !bcmp(ndp->ni_ptr, ep->d_name,
                                (unsigned)ep->d_namlen)) {
                                /*
                                 * Save directory entry's inode number and
                            !bcmp(ndp->ni_ptr, ep->d_name,
                                (unsigned)ep->d_namlen)) {
                                /*
                                 * Save directory entry's inode number and

-                                * reclen in ndp->ni_dent, and release
+                                * reclen in ndp->ni_ufs area, and release

                                 * directory buffer.
                                 */
                                 * directory buffer.
                                 */

-                               ndp->ni_dent.d_ino = ep->d_ino;
-                               ndp->ni_dent.d_reclen = ep->d_reclen;
+                               ndp->ni_ufs.ufs_ino = ep->d_ino;
+                               ndp->ni_ufs.ufs_reclen = ep->d_reclen;

                                brelse(bp);
                                goto found;
                        }
                }
                                brelse(bp);
                                goto found;
                        }
                }

-               prevoff = ndp->ni_offset;
-               ndp->ni_offset += ep->d_reclen;
+               prevoff = ndp->ni_ufs.ufs_offset;
+               ndp->ni_ufs.ufs_offset += ep->d_reclen;

                entryoffsetinblock += ep->d_reclen;
                if (ep->d_ino)
                entryoffsetinblock += ep->d_reclen;
                if (ep->d_ino)

-                       enduseful = ndp->ni_offset;
+                       enduseful = ndp->ni_ufs.ufs_offset;

        }
 /* notfound: */
        /*
        }
 /* notfound: */
        /*


@@ -290,7 +306,7 @@ searchloop:
         */
        if (numdirpasses == 2) {
                numdirpasses--;
         */
        if (numdirpasses == 2) {
                numdirpasses--;

-               ndp->ni_offset = 0;
+               ndp->ni_ufs.ufs_offset = 0;

                endsearch = dp->i_diroff;
                goto searchloop;
        }
                endsearch = dp->i_diroff;
                goto searchloop;
        }


@@ -307,27 +323,28 @@ searchloop:
                 * Access for write is interpreted as allowing
                 * creation of files in the directory.
                 */
                 * Access for write is interpreted as allowing
                 * creation of files in the directory.
                 */

-               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred))
+               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))

                        return (error);
                /*
                 * Return an indication of where the new directory
                 * entry should be put.  If we didn't find a slot,
                        return (error);
                /*
                 * Return an indication of where the new directory
                 * entry should be put.  If we didn't find a slot,

-                * then set ndp->ni_count to 0 indicating that the new
-                * slot belongs at the end of the directory. If we found
-                * a slot, then the new entry can be put in the range
-                * [ndp->ni_offset .. ndp->ni_offset + ndp->ni_count)
+                * then set ndp->ni_ufs.ufs_count to 0 indicating
+                * that the new slot belongs at the end of the
+                * directory. If we found a slot, then the new entry
+                * can be put in the range from ndp->ni_ufs.ufs_offset
+                * to ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count.

                 */
                if (slotstatus == NONE) {
                 */
                if (slotstatus == NONE) {

-                       ndp->ni_offset = roundup(dp->i_size, DIRBLKSIZ);
-                       ndp->ni_count = 0;
-                       enduseful = ndp->ni_offset;
+                       ndp->ni_ufs.ufs_offset = roundup(dp->i_size, DIRBLKSIZ);
+                       ndp->ni_ufs.ufs_count = 0;
+                       enduseful = ndp->ni_ufs.ufs_offset;

                } else {
                } else {

-                       ndp->ni_offset = slotoffset;
-                       ndp->ni_count = slotsize;
+                       ndp->ni_ufs.ufs_offset = slotoffset;
+                       ndp->ni_ufs.ufs_count = slotsize;

                        if (enduseful < slotoffset + slotsize)
                                enduseful = slotoffset + slotsize;
                }
                        if (enduseful < slotoffset + slotsize)
                                enduseful = slotoffset + slotsize;
                }

-               ndp->ni_endoff = roundup(enduseful, DIRBLKSIZ);
+               ndp->ni_ufs.ufs_endoff = roundup(enduseful, DIRBLKSIZ);

                dp->i_flag |= IUPD|ICHG;
                /*
                 * We return with the directory locked, so that
                dp->i_flag |= IUPD|ICHG;
                /*
                 * We return with the directory locked, so that


@@ -336,17 +353,20 @@ searchloop:
                 * We return ni_vp == NULL to indicate that the entry
                 * does not currently exist; we leave a pointer to
                 * the (locked) directory inode in ndp->ni_dvp.
                 * We return ni_vp == NULL to indicate that the entry
                 * does not currently exist; we leave a pointer to
                 * the (locked) directory inode in ndp->ni_dvp.

+                * The pathname buffer is saved so that the name
+                * can be obtained later.

                 *
                 * NB - if the directory is unlocked, then this
                 * information cannot be used.
                 */
                 *
                 * NB - if the directory is unlocked, then this
                 * information cannot be used.
                 */

+               ndp->ni_nameiop |= SAVENAME;

                if (!lockparent)
                        IUNLOCK(dp);
        }
        /*
         * Insert name into cache (as non-existent) if appropriate.
         */
                if (!lockparent)
                        IUNLOCK(dp);
        }
        /*
         * Insert name into cache (as non-existent) if appropriate.
         */

-       if (ndp->ni_makeentry)
+       if (ndp->ni_makeentry && flag != CREATE)

                cache_enter(ndp);
        return (ENOENT);
 
                cache_enter(ndp);
        return (ENOENT);
 


@@ -358,7 +378,7 @@ found:
         * of this entry.
         */
        if (entryoffsetinblock + DIRSIZ(ep) > dp->i_size) {
         * of this entry.
         */
        if (entryoffsetinblock + DIRSIZ(ep) > dp->i_size) {

-               dirbad(dp, ndp->ni_offset, "i_size too small");
+               ufs_dirbad(dp, ndp->ni_ufs.ufs_offset, "i_size too small");

                dp->i_size = entryoffsetinblock + DIRSIZ(ep);
                dp->i_flag |= IUPD|ICHG;
        }
                dp->i_size = entryoffsetinblock + DIRSIZ(ep);
                dp->i_flag |= IUPD|ICHG;
        }


@@ -369,7 +389,7 @@ found:
         * in the cache as to where the entry was found.
         */
        if (*ndp->ni_next == '\0' && flag == LOOKUP)
         * in the cache as to where the entry was found.
         */
        if (*ndp->ni_next == '\0' && flag == LOOKUP)

-               dp->i_diroff = ndp->ni_offset &~ (DIRBLKSIZ - 1);
+               dp->i_diroff = ndp->ni_ufs.ufs_offset &~ (DIRBLKSIZ - 1);

 
        /*
         * If deleting, and at end of pathname, return
 
        /*
         * If deleting, and at end of pathname, return


@@ -382,24 +402,25 @@ found:
                /*
                 * Write access to directory required to delete files.
                 */
                /*
                 * Write access to directory required to delete files.
                 */

-               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred))
+               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))

                        return (error);
                /*
                        return (error);
                /*

-                * Return pointer to current entry in ndp->ni_offset,
+                * Return pointer to current entry in ndp->ni_ufs.ufs_offset,

                 * and distance past previous entry (if there
                 * and distance past previous entry (if there

-                * is a previous entry in this block) in ndp->ni_count.
+                * is a previous entry in this block) in ndp->ni_ufs.ufs_count.

                 * Save directory inode pointer in ndp->ni_dvp for dirremove().
                 */
                 * Save directory inode pointer in ndp->ni_dvp for dirremove().
                 */

-               if ((ndp->ni_offset&(DIRBLKSIZ-1)) == 0)
-                       ndp->ni_count = 0;
+               if ((ndp->ni_ufs.ufs_offset&(DIRBLKSIZ-1)) == 0)
+                       ndp->ni_ufs.ufs_count = 0;

                else
                else

-                       ndp->ni_count = ndp->ni_offset - prevoff;
-               if (dp->i_number == ndp->ni_dent.d_ino) {
+                       ndp->ni_ufs.ufs_count =
+                           ndp->ni_ufs.ufs_offset - prevoff;
+               if (dp->i_number == ndp->ni_ufs.ufs_ino) {

                        VREF(vdp);
                        ndp->ni_vp = vdp;
                        return (0);
                }
                        VREF(vdp);
                        ndp->ni_vp = vdp;
                        return (0);
                }

-               if (error = iget(dp, ndp->ni_dent.d_ino, &tdp))
+               if (error = VOP_VGET(vdp, ndp->ni_ufs.ufs_ino, &tdp))

                        return (error);
                /*
                 * If directory is "sticky", then user must own
                        return (error);
                /*
                 * If directory is "sticky", then user must own


@@ -410,11 +431,11 @@ found:
                if ((dp->i_mode & ISVTX) &&
                    ndp->ni_cred->cr_uid != 0 &&
                    ndp->ni_cred->cr_uid != dp->i_uid &&
                if ((dp->i_mode & ISVTX) &&
                    ndp->ni_cred->cr_uid != 0 &&
                    ndp->ni_cred->cr_uid != dp->i_uid &&

-                   tdp->i_uid != ndp->ni_cred->cr_uid) {
-                       iput(tdp);
+                   VTOI(tdp)->i_uid != ndp->ni_cred->cr_uid) {
+                       vput(tdp);

                        return (EPERM);
                }
                        return (EPERM);
                }

-               ndp->ni_vp = ITOV(tdp);
+               ndp->ni_vp = tdp;

                if (!lockparent)
                        IUNLOCK(dp);
                return (0);
                if (!lockparent)
                        IUNLOCK(dp);
                return (0);


@@ -427,17 +448,18 @@ found:
         * regular file, or empty directory.
         */
        if (flag == RENAME && wantparent && *ndp->ni_next == 0) {
         * regular file, or empty directory.
         */
        if (flag == RENAME && wantparent && *ndp->ni_next == 0) {

-               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred))
+               if (error = ufs_access(vdp, VWRITE, ndp->ni_cred, p))

                        return (error);
                /*
                 * Careful about locking second inode.
                 * This can only occur if the target is ".".
                 */
                        return (error);
                /*
                 * Careful about locking second inode.
                 * This can only occur if the target is ".".
                 */

-               if (dp->i_number == ndp->ni_dent.d_ino)
+               if (dp->i_number == ndp->ni_ufs.ufs_ino)

                        return (EISDIR);
                        return (EISDIR);

-               if (error = iget(dp, ndp->ni_dent.d_ino, &tdp))
+               if (error = VOP_VGET(vdp, ndp->ni_ufs.ufs_ino, &tdp))

                        return (error);
                        return (error);

-               ndp->ni_vp = ITOV(tdp);
+               ndp->ni_vp = tdp;
+               ndp->ni_nameiop |= SAVENAME;

                if (!lockparent)
                        IUNLOCK(dp);
                return (0);
                if (!lockparent)
                        IUNLOCK(dp);
                return (0);


@@ -465,22 +487,22 @@ found:
        pdp = dp;
        if (ndp->ni_isdotdot) {
                IUNLOCK(pdp);   /* race to get the inode */
        pdp = dp;
        if (ndp->ni_isdotdot) {
                IUNLOCK(pdp);   /* race to get the inode */

-               if (error = iget(dp, ndp->ni_dent.d_ino, &tdp)) {
+               if (error = VOP_VGET(vdp, ndp->ni_ufs.ufs_ino, &tdp)) {

                        ILOCK(pdp);
                        return (error);
                }
                if (lockparent && *ndp->ni_next == '\0')
                        ILOCK(pdp);
                        ILOCK(pdp);
                        return (error);
                }
                if (lockparent && *ndp->ni_next == '\0')
                        ILOCK(pdp);

-               ndp->ni_vp = ITOV(tdp);
-       } else if (dp->i_number == ndp->ni_dent.d_ino) {
+               ndp->ni_vp = tdp;
+       } else if (dp->i_number == ndp->ni_ufs.ufs_ino) {

                VREF(vdp);      /* we want ourself, ie "." */
                ndp->ni_vp = vdp;
        } else {
                VREF(vdp);      /* we want ourself, ie "." */
                ndp->ni_vp = vdp;
        } else {

-               if (error = iget(dp, ndp->ni_dent.d_ino, &tdp))
+               if (error = VOP_VGET(vdp, ndp->ni_ufs.ufs_ino, &tdp))

                        return (error);
                if (!lockparent || *ndp->ni_next != '\0')
                        IUNLOCK(pdp);
                        return (error);
                if (!lockparent || *ndp->ni_next != '\0')
                        IUNLOCK(pdp);

-               ndp->ni_vp = ITOV(tdp);
+               ndp->ni_vp = tdp;

        }
 
        /*
        }
 
        /*


@@ -491,16 +513,19 @@ found:
        return (0);
 }
 
        return (0);
 }
 

-
-dirbad(ip, offset, how)
+void
+ufs_dirbad(ip, offset, how)

        struct inode *ip;
        off_t offset;
        char *how;
 {
        struct inode *ip;
        off_t offset;
        char *how;
 {

+       struct mount *mp;

 
 

-       printf("%s: bad dir ino %d at offset %d: %s\n",
-           ip->i_fs->fs_fsmnt, ip->i_number, offset, how);
-       panic("bad dir");
+       mp = ITOV(ip)->v_mount;
+       (void)printf("%s: bad dir ino %d at offset %d: %s\n",
+           mp->mnt_stat.f_mntonname, ip->i_number, offset, how);
+       if ((mp->mnt_stat.f_flags & MNT_RDONLY) == 0)
+               panic("bad dir");

 }
 
 /*
 }
 
 /*


@@ -511,7 +536,8 @@ dirbad(ip, offset, how)
  *     name is not longer than MAXNAMLEN
  *     name must be as long as advertised, and null terminated
  */
  *     name is not longer than MAXNAMLEN
  *     name must be as long as advertised, and null terminated
  */

-dirbadentry(ep, entryoffsetinblock)
+int
+ufs_dirbadentry(ep, entryoffsetinblock)

        register struct direct *ep;
        int entryoffsetinblock;
 {
        register struct direct *ep;
        int entryoffsetinblock;
 {


@@ -519,69 +545,98 @@ dirbadentry(ep, entryoffsetinblock)
 
        if ((ep->d_reclen & 0x3) != 0 ||
            ep->d_reclen > DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)) ||
 
        if ((ep->d_reclen & 0x3) != 0 ||
            ep->d_reclen > DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)) ||

-           ep->d_reclen < DIRSIZ(ep) || ep->d_namlen > MAXNAMLEN)
-               return (1);
+           ep->d_reclen < DIRSIZ(ep) || ep->d_namlen > MAXNAMLEN) {
+               /*return (1); */
+               printf("First bad\n");
+               goto bad;
+       }

        for (i = 0; i < ep->d_namlen; i++)
        for (i = 0; i < ep->d_namlen; i++)

-               if (ep->d_name[i] == '\0')
-                       return (1);
+               if (ep->d_name[i] == '\0') {
+                       /*return (1); */
+                       printf("Second bad\n");
+                       goto bad;
+       }
+       if (ep->d_name[i])
+               goto bad;

        return (ep->d_name[i]);
        return (ep->d_name[i]);

+bad:
+printf("ufs_dirbadentry: jumping out: reclen: %d namlen %d ino %d name %s\n",
+       ep->d_reclen, ep->d_namlen, ep->d_ino, ep->d_name );
+       return(1);

 }
 
 /*
  * Write a directory entry after a call to namei, using the parameters
 }
 
 /*
  * Write a directory entry after a call to namei, using the parameters

- * which it left in nameidata.  The argument ip is the inode which the
- * new directory entry will refer to.  The nameidata field ndp->ni_dvp
- * is a pointer to the directory to be written, which was left locked by
- * namei.  Remaining parameters (ndp->ni_offset, ndp->ni_count) indicate
- * how the space for the new entry is to be gotten.
+ * that it left in nameidata.  The argument ip is the inode which the new
+ * directory entry will refer to.  The nameidata field ndp->ni_dvp is a
+ * pointer to the directory to be written, which was left locked by namei.
+ * Remaining parameters (ndp->ni_ufs.ufs_offset, ndp->ni_ufs.ufs_count)
+ * indicate how the space for the new entry is to be obtained.

  */
  */

-direnter(ip, ndp)
+int
+ufs_direnter(ip, ndp)

        struct inode *ip;
        register struct nameidata *ndp;
 {
        register struct direct *ep, *nep;
        struct inode *ip;
        register struct nameidata *ndp;
 {
        register struct direct *ep, *nep;

-       register struct inode *dp = VTOI(ndp->ni_dvp);
+       register struct inode *dp;
+       register struct vnode *dvp;

        struct buf *bp;
        struct buf *bp;

-       int loc, spacefree, error = 0;
+       struct direct newdir;
+       struct iovec aiov;
+       struct uio auio;

        u_int dsize;
        u_int dsize;

-       int newentrysize;
+       int error, loc, newentrysize, spacefree;

        char *dirbuf;
 
        char *dirbuf;
 

-       ndp->ni_dent.d_ino = ip->i_number;
-       newentrysize = DIRSIZ(&ndp->ni_dent);
-       if (ndp->ni_count == 0) {
+#ifdef DIAGNOSTIC
+       if ((ndp->ni_nameiop & SAVENAME) == 0)
+               panic("direnter: missing name");
+#endif
+       dvp = ndp->ni_dvp;
+       dp = VTOI(dvp);
+       newdir.d_ino = ip->i_number;
+       newdir.d_namlen = ndp->ni_namelen;
+       bcopy(ndp->ni_ptr, newdir.d_name, (unsigned)ndp->ni_namelen + 1);
+       newentrysize = DIRSIZ(&newdir);
+       if (ndp->ni_ufs.ufs_count == 0) {

                /*
                /*

-                * If ndp->ni_count is 0, then namei could find no space in the
-                * directory. In this case ndp->ni_offset will be on a directory
-                * block boundary and we will write the new entry into a fresh
-                * block.
+                * If ndp->ni_ufs.ufs_count is 0, then namei could find no
+                * space in the directory. Here, ndp->ni_ufs.ufs_offset will
+                * be on a directory block boundary and we will write the
+                * new entry into a fresh block.

                 */
                 */

-               if (ndp->ni_offset&(DIRBLKSIZ-1))
+               if (ndp->ni_ufs.ufs_offset & (DIRBLKSIZ - 1))

                        panic("wdir: newblk");
                        panic("wdir: newblk");

-               ndp->ni_dent.d_reclen = DIRBLKSIZ;
-               ndp->ni_count = newentrysize;
-               ndp->ni_resid = newentrysize;
-               ndp->ni_base = (caddr_t)&ndp->ni_dent;
-               ndp->ni_uioseg = UIO_SYSSPACE;
-               error =
-                   ufs_write(ndp->ni_dvp, &ndp->ni_uio, IO_SYNC, ndp->ni_cred);
-               if (DIRBLKSIZ > dp->i_fs->fs_fsize) {
-                       panic("wdir: blksize"); /* XXX - should grow w/balloc */
-               } else {
+               auio.uio_offset = ndp->ni_ufs.ufs_offset;
+               newdir.d_reclen = DIRBLKSIZ;
+               auio.uio_resid = newentrysize;
+               aiov.iov_len = newentrysize;
+               aiov.iov_base = (caddr_t)&newdir;
+               auio.uio_iov = &aiov;
+               auio.uio_iovcnt = 1;
+               auio.uio_rw = UIO_WRITE;
+               auio.uio_segflg = UIO_SYSSPACE;
+               auio.uio_procp = (struct proc *)0;
+               error = VOP_WRITE(dvp, &auio, IO_SYNC, ndp->ni_cred);
+               if (DIRBLKSIZ >
+                   VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize)
+                       /* XXX should grow with balloc() */
+                       panic("ufs_direnter: frag size");
+               else if (!error) {

                        dp->i_size = roundup(dp->i_size, DIRBLKSIZ);
                        dp->i_flag |= ICHG;
                }
                        dp->i_size = roundup(dp->i_size, DIRBLKSIZ);
                        dp->i_flag |= ICHG;
                }

-               iput(dp);

                return (error);
        }
 
        /*
                return (error);
        }
 
        /*

-        * If ndp->ni_count is non-zero, then namei found space for the new
-        * entry in the range ndp->ni_offset to ndp->ni_offset + ndp->ni_count.
-        * in the directory.  To use this space, we may have to compact
-        * the entries located there, by copying them together towards
-        * the beginning of the block, leaving the free space in
-        * one usable chunk at the end.
+        * If ndp->ni_ufs.ufs_count is non-zero, then namei found space
+        * for the new entry in the range ndp->ni_ufs.ufs_offset to
+        * ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count in the directory.
+        * To use this space, we may have to compact the entries located
+        * there, by copying them together towards the beginning of the
+        * block, leaving the free space in one usable chunk at the end.

         */
 
        /*
         */
 
        /*


@@ -591,25 +646,24 @@ direnter(ip, ndp)
         *
         * N.B. - THIS IS AN ARTIFACT OF 4.2 AND SHOULD NEVER HAPPEN.
         */
         *
         * N.B. - THIS IS AN ARTIFACT OF 4.2 AND SHOULD NEVER HAPPEN.
         */

-       if (ndp->ni_offset + ndp->ni_count > dp->i_size)
-               dp->i_size = ndp->ni_offset + ndp->ni_count;
+       if (ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count > dp->i_size)
+               dp->i_size = ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count;

        /*
         * Get the block containing the space for the new directory entry.
         */
        /*
         * Get the block containing the space for the new directory entry.
         */

-       if (error = blkatoff(dp, ndp->ni_offset, (char **)&dirbuf, &bp)) {
-               iput(dp);
+       if (error = VOP_BLKATOFF(dvp, ndp->ni_ufs.ufs_offset, &dirbuf, &bp))

                return (error);
                return (error);

-       }

        /*
        /*

-        * Find space for the new entry.  In the simple case, the
-        * entry at offset base will have the space.  If it does
-        * not, then namei arranged that compacting the region
-        * ndp->ni_offset to ndp->ni_offset+ndp->ni_count would yield the space.
+        * Find space for the new entry. In the simple case, the entry at
+        * offset base will have the space. If it does not, then namei
+        * arranged that compacting the region ndp->ni_ufs.ufs_offset to
+        * ndp->ni_ufs.ufs_offset + ndp->ni_ufs.ufs_count would yield the
+        * space.

         */
        ep = (struct direct *)dirbuf;
        dsize = DIRSIZ(ep);
        spacefree = ep->d_reclen - dsize;
         */
        ep = (struct direct *)dirbuf;
        dsize = DIRSIZ(ep);
        spacefree = ep->d_reclen - dsize;

-       for (loc = ep->d_reclen; loc < ndp->ni_count; ) {
+       for (loc = ep->d_reclen; loc < ndp->ni_ufs.ufs_count; ) {

                nep = (struct direct *)(dirbuf + loc);
                if (ep->d_ino) {
                        /* trim the existing slot */
                nep = (struct direct *)(dirbuf + loc);
                if (ep->d_ino) {
                        /* trim the existing slot */


@@ -631,65 +685,67 @@ direnter(ip, ndp)
        if (ep->d_ino == 0) {
                if (spacefree + dsize < newentrysize)
                        panic("wdir: compact1");
        if (ep->d_ino == 0) {
                if (spacefree + dsize < newentrysize)
                        panic("wdir: compact1");

-               ndp->ni_dent.d_reclen = spacefree + dsize;
+               newdir.d_reclen = spacefree + dsize;

        } else {
                if (spacefree < newentrysize)
                        panic("wdir: compact2");
        } else {
                if (spacefree < newentrysize)
                        panic("wdir: compact2");

-               ndp->ni_dent.d_reclen = spacefree;
+               newdir.d_reclen = spacefree;

                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }

-       bcopy((caddr_t)&ndp->ni_dent, (caddr_t)ep, (u_int)newentrysize);
-       error = bwrite(bp);
+       bcopy((caddr_t)&newdir, (caddr_t)ep, (u_int)newentrysize);
+       error = VOP_BWRITE(bp);

        dp->i_flag |= IUPD|ICHG;
        dp->i_flag |= IUPD|ICHG;

-       if (!error && ndp->ni_endoff && ndp->ni_endoff < dp->i_size)
-               error = itrunc(dp, (u_long)ndp->ni_endoff, IO_SYNC);
-       iput(dp);
+       if (!error && ndp->ni_ufs.ufs_endoff &&
+           ndp->ni_ufs.ufs_endoff < dp->i_size)
+               error = VOP_TRUNCATE(dvp, (u_long)ndp->ni_ufs.ufs_endoff,
+                   IO_SYNC);

        return (error);
 }
 
 /*
  * Remove a directory entry after a call to namei, using
  * the parameters which it left in nameidata. The entry
        return (error);
 }
 
 /*
  * Remove a directory entry after a call to namei, using
  * the parameters which it left in nameidata. The entry

- * ni_offset contains the offset into the directory of the
- * entry to be eliminated.  The ni_count field contains the
+ * ni_ufs.ufs_offset contains the offset into the directory of the
+ * entry to be eliminated.  The ni_ufs.ufs_count field contains the

  * size of the previous record in the directory.  If this
  * is 0, the first entry is being deleted, so we need only
  * zero the inode number to mark the entry as free.  If the
  * size of the previous record in the directory.  If this
  * is 0, the first entry is being deleted, so we need only
  * zero the inode number to mark the entry as free.  If the

- * entry isn't the first in the directory, we must reclaim
+ * entry is not the first in the directory, we must reclaim

  * the space of the now empty record by adding the record size
  * to the size of the previous entry.
  */
  * the space of the now empty record by adding the record size
  * to the size of the previous entry.
  */

-dirremove(ndp)
+int
+ufs_dirremove(ndp)

        register struct nameidata *ndp;
 {
        register struct nameidata *ndp;
 {

-       register struct inode *dp = VTOI(ndp->ni_dvp);
+       register struct inode *dp;

        struct direct *ep;
        struct buf *bp;
        int error;
 
        struct direct *ep;
        struct buf *bp;
        int error;
 

-       if (ndp->ni_count == 0) {
+       dp = VTOI(ndp->ni_dvp);
+       if (ndp->ni_ufs.ufs_count == 0) {

                /*
                 * First entry in block: set d_ino to zero.
                 */
                /*
                 * First entry in block: set d_ino to zero.
                 */

-               ndp->ni_dent.d_ino = 0;
-               ndp->ni_count = ndp->ni_resid = DIRSIZ(&ndp->ni_dent);
-               ndp->ni_base = (caddr_t)&ndp->ni_dent;
-               ndp->ni_uioseg = UIO_SYSSPACE;
-               error =
-                   ufs_write(ndp->ni_dvp, &ndp->ni_uio, IO_SYNC, ndp->ni_cred);
-       } else {
-               /*
-                * Collapse new free space into previous entry.
-                */
-               if (error = blkatoff(dp, ndp->ni_offset - ndp->ni_count,
-                   (char **)&ep, &bp)) {
+               if (error = VOP_BLKATOFF(ndp->ni_dvp, ndp->ni_ufs.ufs_offset,
+                   (char **)&ep, &bp))

                        return (error);
                        return (error);

-               }
-               ep->d_reclen += ndp->ni_dent.d_reclen;
-               error = bwrite(bp);
+               ep->d_ino = 0;
+               error = VOP_BWRITE(bp);

                dp->i_flag |= IUPD|ICHG;
                dp->i_flag |= IUPD|ICHG;

+               return (error);

        }
        }

+       /*
+        * Collapse new free space into previous entry.
+        */
+       if (error = VOP_BLKATOFF(ndp->ni_dvp,
+           ndp->ni_ufs.ufs_offset - ndp->ni_ufs.ufs_count, (char **)&ep, &bp))
+               return (error);
+       ep->d_reclen += ndp->ni_ufs.ufs_reclen;
+       error = VOP_BWRITE(bp);
+       dp->i_flag |= IUPD|ICHG;

        return (error);
 }
 
        return (error);
 }
 


@@ -698,46 +754,22 @@ dirremove(ndp)
  * supplied.  The parameters describing the directory entry are
  * set up by a call to namei.
  */
  * supplied.  The parameters describing the directory entry are
  * set up by a call to namei.
  */

-dirrewrite(dp, ip, ndp)
+int
+ufs_dirrewrite(dp, ip, ndp)

        struct inode *dp, *ip;
        struct nameidata *ndp;
 {
        struct inode *dp, *ip;
        struct nameidata *ndp;
 {

-
-       ndp->ni_dent.d_ino = ip->i_number;
-       ndp->ni_count = ndp->ni_resid = DIRSIZ(&ndp->ni_dent);
-       ndp->ni_base = (caddr_t)&ndp->ni_dent;
-       ndp->ni_uioseg = UIO_SYSSPACE;
-       return (ufs_write(ITOV(dp), &ndp->ni_uio, IO_SYNC, ndp->ni_cred));
-}
-
-/*
- * Return buffer with contents of block "offset"
- * from the beginning of directory "ip".  If "res"
- * is non-zero, fill it in with a pointer to the
- * remaining space in the directory.
- */
-blkatoff(ip, offset, res, bpp)
-       struct inode *ip;
-       off_t offset;
-       char **res;
-       struct buf **bpp;
-{
-       register struct fs *fs = ip->i_fs;
-       daddr_t lbn = lblkno(fs, offset);
-       int bsize = blksize(fs, ip, lbn);

        struct buf *bp;
        struct buf *bp;

-       daddr_t bn;
+       struct direct *ep;

        int error;
 
        int error;
 

-       *bpp = 0;
-       if (error = bread(ITOV(ip), lbn, bsize, NOCRED, &bp)) {
-               brelse(bp);
+       if (error = VOP_BLKATOFF(ITOV(dp), ndp->ni_ufs.ufs_offset,
+           (char **)&ep, &bp))

                return (error);
                return (error);

-       }
-       if (res)
-               *res = bp->b_un.b_addr + blkoff(fs, offset);
-       *bpp = bp;
-       return (0);
+       ep->d_ino = ip->i_number;
+       error = VOP_BWRITE(bp);
+       dp->i_flag |= IUPD|ICHG;
+       return (error);

 }
 
 /*
 }
 
 /*


@@ -749,7 +781,8 @@ blkatoff(ip, offset, res, bpp)
  *
  * NB: does not handle corrupted directories.
  */
  *
  * NB: does not handle corrupted directories.
  */

-dirempty(ip, parentino, cred)
+int
+ufs_dirempty(ip, parentino, cred)

        register struct inode *ip;
        ino_t parentino;
        struct ucred *cred;
        register struct inode *ip;
        ino_t parentino;
        struct ucred *cred;


@@ -761,8 +794,8 @@ dirempty(ip, parentino, cred)
 #define        MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
        for (off = 0; off < ip->i_size; off += dp->d_reclen) {
 #define        MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
        for (off = 0; off < ip->i_size; off += dp->d_reclen) {

-               error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ,
-                   off, UIO_SYSSPACE, IO_NODELOCKED, cred, &count);
+               error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off,
+                  UIO_SYSSPACE, IO_NODELOCKED, cred, &count, (struct proc *)0);

                /*
                 * Since we read MINDIRSIZ, residual must
                 * be 0 unless we're at end of file.
                /*
                 * Since we read MINDIRSIZ, residual must
                 * be 0 unless we're at end of file.


@@ -797,22 +830,26 @@ dirempty(ip, parentino, cred)
 /*
  * Check if source directory is in the path of the target directory.
  * Target is supplied locked, source is unlocked.
 /*
  * Check if source directory is in the path of the target directory.
  * Target is supplied locked, source is unlocked.

- * The target is always iput() before returning.
+ * The target is always iput before returning.

  */
  */

-checkpath(source, target, cred)
+int
+ufs_checkpath(source, target, cred)

        struct inode *source, *target;
        struct ucred *cred;
 {
        struct dirtemplate dirbuf;
        struct inode *source, *target;
        struct ucred *cred;
 {
        struct dirtemplate dirbuf;

-       struct inode *ip;
-       int error = 0;
+       register struct inode *ip;
+       struct vnode *vp;
+       int error, rootino;

 
        ip = target;
        if (ip->i_number == source->i_number) {
                error = EEXIST;
                goto out;
        }
 
        ip = target;
        if (ip->i_number == source->i_number) {
                error = EEXIST;
                goto out;
        }

-       if (ip->i_number == ROOTINO)
+       rootino = ROOTINO;
+       error = 0;
+       if (ip->i_number == rootino)

                goto out;
 
        for (;;) {
                goto out;
 
        for (;;) {


@@ -820,9 +857,10 @@ checkpath(source, target, cred)
                        error = ENOTDIR;
                        break;
                }
                        error = ENOTDIR;
                        break;
                }

-               error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)&dirbuf,
+               vp = ITOV(ip);
+               error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,

                        sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
                        sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,

-                       IO_NODELOCKED, cred, (int *)0);
+                       IO_NODELOCKED, cred, (int *)0, (struct proc *)0);

                if (error != 0)
                        break;
                if (dirbuf.dotdot_namlen != 2 ||
                if (error != 0)
                        break;
                if (dirbuf.dotdot_namlen != 2 ||


@@ -835,17 +873,18 @@ checkpath(source, target, cred)
                        error = EINVAL;
                        break;
                }
                        error = EINVAL;
                        break;
                }

-               if (dirbuf.dotdot_ino == ROOTINO)
+               if (dirbuf.dotdot_ino == rootino)

                        break;
                        break;

-               iput(ip);
-               if (error = iget(ip, dirbuf.dotdot_ino, &ip))
+               ufs_iput(ip);
+               if (error = VOP_VGET(vp, dirbuf.dotdot_ino, &vp))

                        break;
                        break;

+               ip = VTOI(vp);

        }
 
 out:
        if (error == ENOTDIR)
                printf("checkpath: .. not a directory\n");
        if (ip != NULL)
        }
 
 out:
        if (error == ENOTDIR)
                printf("checkpath: .. not a directory\n");
        if (ip != NULL)

-               iput(ip);
+               ufs_iput(ip);

        return (error);
 }
        return (error);
 }