use dirbad rather than printf
[unix-history] / usr / src / sys / ufs / ffs / ffs_vnops.c
index 823c504..1430af9 100644 (file)
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *     @(#)ffs_vnops.c 7.8 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.23 (Berkeley) %G%
  */
 
 #include "param.h"
  */
 
 #include "param.h"
@@ -64,6 +64,7 @@ int   ufs_lookup(),
        ufs_readlink(),
        ufs_abortop(),
        ufs_inactive(),
        ufs_readlink(),
        ufs_abortop(),
        ufs_inactive(),
+       ufs_reclaim(),
        ufs_lock(),
        ufs_unlock(),
        ufs_bmap(),
        ufs_lock(),
        ufs_unlock(),
        ufs_bmap(),
@@ -95,12 +96,57 @@ struct vnodeops ufs_vnodeops = {
        ufs_readlink,
        ufs_abortop,
        ufs_inactive,
        ufs_readlink,
        ufs_abortop,
        ufs_inactive,
+       ufs_reclaim,
        ufs_lock,
        ufs_unlock,
        ufs_bmap,
        ufs_strategy,
 };
 
        ufs_lock,
        ufs_unlock,
        ufs_bmap,
        ufs_strategy,
 };
 
+int    spec_lookup(),
+       spec_open(),
+       spec_read(),
+       spec_write(),
+       spec_strategy(),
+       spec_ioctl(),
+       spec_select(),
+       spec_close(),
+       spec_badop(),
+       spec_nullop();
+
+struct vnodeops spec_inodeops = {
+       spec_lookup,            /* lookup */
+       spec_badop,             /* create */
+       spec_badop,             /* mknod */
+       spec_open,              /* open */
+       spec_close,             /* close */
+       ufs_access,             /* access */
+       ufs_getattr,            /* getattr */
+       ufs_setattr,            /* setattr */
+       spec_read,              /* read */
+       spec_write,             /* write */
+       spec_ioctl,             /* ioctl */
+       spec_select,            /* select */
+       spec_badop,             /* mmap */
+       spec_nullop,            /* fsync */
+       spec_badop,             /* seek */
+       spec_badop,             /* remove */
+       spec_badop,             /* link */
+       spec_badop,             /* rename */
+       spec_badop,             /* mkdir */
+       spec_badop,             /* rmdir */
+       spec_badop,             /* symlink */
+       spec_badop,             /* readdir */
+       spec_badop,             /* readlink */
+       spec_badop,             /* abortop */
+       ufs_inactive,           /* inactive */
+       ufs_reclaim,            /* reclaim */
+       ufs_lock,               /* lock */
+       ufs_unlock,             /* unlock */
+       spec_badop,             /* bmap */
+       spec_strategy,          /* strategy */
+};
+
 enum vtype iftovt_tab[8] = {
        VNON, VCHR, VDIR, VBLK, VREG, VLNK, VSOCK, VBAD,
 };
 enum vtype iftovt_tab[8] = {
        VNON, VCHR, VDIR, VBLK, VREG, VLNK, VSOCK, VBAD,
 };
@@ -133,28 +179,29 @@ ufs_mknod(ndp, vap, cred)
        struct ucred *cred;
        struct vattr *vap;
 {
        struct ucred *cred;
        struct vattr *vap;
 {
+       register struct vnode *vp;
        struct inode *ip;
        int error;
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);
        struct inode *ip;
        int error;
 
        if (error = maknode(MAKEIMODE(vap->va_type, vap->va_mode), ndp, &ip))
                return (error);
+       vp = ITOV(ip);
        if (vap->va_rdev) {
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
                 */
        if (vap->va_rdev) {
                /*
                 * Want to be able to use this to make badblock
                 * inodes, so don't truncate the dev number.
                 */
-               ITOV(ip)->v_rdev = ip->i_rdev = vap->va_rdev;
+               ip->i_rdev = vap->va_rdev;
                ip->i_flag |= IACC|IUPD|ICHG;
        }
                ip->i_flag |= IACC|IUPD|ICHG;
        }
-       iput(ip);
        /*
         * Remove inode so that it will be reloaded by iget and
         * checked to see if it is an alias of an existing entry
         * in the inode cache.
         */
        /*
         * Remove inode so that it will be reloaded by iget and
         * checked to see if it is an alias of an existing entry
         * in the inode cache.
         */
-       remque(ip);
-       ip->i_forw = ip;
-       ip->i_back = ip;
+       iput(ip);
+       vp->v_type = VNON;
+       vgone(vp);
        return (0);
 }
 
        return (0);
 }
 
@@ -219,11 +266,16 @@ ufs_getattr(vp, vap, cred)
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
-       vap->va_size = ip->i_ic.ic_size.val[0];
-       vap->va_size1 = ip->i_ic.ic_size.val[1];
+       vap->va_size = ip->i_din.di_qsize.val[0];
+       vap->va_size1 = ip->i_din.di_qsize.val[1];
        vap->va_atime.tv_sec = ip->i_atime;
        vap->va_atime.tv_sec = ip->i_atime;
+       vap->va_atime.tv_usec = 0;
        vap->va_mtime.tv_sec = ip->i_mtime;
        vap->va_mtime.tv_sec = ip->i_mtime;
+       vap->va_mtime.tv_usec = 0;
        vap->va_ctime.tv_sec = ip->i_ctime;
        vap->va_ctime.tv_sec = ip->i_ctime;
+       vap->va_ctime.tv_usec = 0;
+       vap->va_flags = ip->i_flags;
+       vap->va_gen = ip->i_gen;
        /* this doesn't belong here */
        if (vp->v_type == VBLK)
                vap->va_blocksize = BLKDEV_IOSIZE;
        /* this doesn't belong here */
        if (vp->v_type == VBLK)
                vap->va_blocksize = BLKDEV_IOSIZE;
@@ -231,11 +283,7 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
+       vap->va_bytes = dbtob(ip->i_blocks);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
@@ -258,7 +306,7 @@ ufs_setattr(vp, vap, cred)
        if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) ||
            (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) ||
            (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) ||
        if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) ||
            (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) ||
            (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) ||
-           ((int)vap->va_bytes != VNOVAL)) {
+           ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) {
                return (EINVAL);
        }
        /*
                return (EINVAL);
        }
        /*
@@ -270,18 +318,13 @@ ufs_setattr(vp, vap, cred)
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);
        if (vap->va_size != VNOVAL) {
                if (vp->v_type == VDIR)
                        return (EISDIR);
-               if (error = iaccess(ip, IWRITE, cred))
-                       return (error);
                if (error = itrunc(ip, vap->va_size))
                        return (error);
        }
                if (error = itrunc(ip, vap->va_size))
                        return (error);
        }
-       /*
-        * Check whether the following attributes can be changed.
-        */
-       if (cred->cr_uid != ip->i_uid &&
-           (error = suser(cred, &u.u_acflag)))
-               return (error);
        if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
        if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
+               if (cred->cr_uid != ip->i_uid &&
+                   (error = suser(cred, &u.u_acflag)))
+                       return (error);
                if (vap->va_atime.tv_sec != VNOVAL)
                        ip->i_flag |= IACC;
                if (vap->va_mtime.tv_sec != VNOVAL)
                if (vap->va_atime.tv_sec != VNOVAL)
                        ip->i_flag |= IACC;
                if (vap->va_mtime.tv_sec != VNOVAL)
@@ -292,6 +335,18 @@ ufs_setattr(vp, vap, cred)
        }
        if (vap->va_mode != (u_short)VNOVAL)
                error = chmod1(vp, (int)vap->va_mode, cred);
        }
        if (vap->va_mode != (u_short)VNOVAL)
                error = chmod1(vp, (int)vap->va_mode, cred);
+       if (vap->va_flags != VNOVAL) {
+               if (cred->cr_uid != ip->i_uid &&
+                   (error = suser(cred, &u.u_acflag)))
+                       return (error);
+               if (cred->cr_uid == 0) {
+                       ip->i_flags = vap->va_flags;
+               } else {
+                       ip->i_flags &= 0xffff0000;
+                       ip->i_flags |= (vap->va_flags & 0xffff);
+               }
+               ip->i_flag |= ICHG;
+       }
        return (error);
 }
 
        return (error);
 }
 
@@ -305,7 +360,11 @@ chmod1(vp, mode, cred)
        struct ucred *cred;
 {
        register struct inode *ip = VTOI(vp);
        struct ucred *cred;
 {
        register struct inode *ip = VTOI(vp);
+       int error;
 
 
+       if (cred->cr_uid != ip->i_uid &&
+           (error = suser(cred, &u.u_acflag)))
+               return (error);
        ip->i_mode &= ~07777;
        if (cred->cr_uid) {
                if (vp->v_type != VDIR)
        ip->i_mode &= ~07777;
        if (cred->cr_uid) {
                if (vp->v_type != VDIR)
@@ -358,11 +417,13 @@ chown1(vp, uid, gid, cred)
        (void) chkiq(ip->i_dev, ip, ip->i_uid, 1);
        dqrele(ip->i_dquot);
 #endif
        (void) chkiq(ip->i_dev, ip, ip->i_uid, 1);
        dqrele(ip->i_dquot);
 #endif
+       if (ip->i_uid != uid && cred->cr_uid != 0)
+               ip->i_mode &= ~ISUID;
+       if (ip->i_gid != gid && cred->cr_uid != 0)
+               ip->i_mode &= ~ISGID;
        ip->i_uid = uid;
        ip->i_gid = gid;
        ip->i_flag |= ICHG;
        ip->i_uid = uid;
        ip->i_gid = gid;
        ip->i_flag |= ICHG;
-       if (cred->cr_ruid != 0)
-               ip->i_mode &= ~(ISUID|ISGID);
 #ifdef QUOTA
        ip->i_dquot = inoquota(ip);
        (void) chkdq(ip, change, 1);
 #ifdef QUOTA
        ip->i_dquot = inoquota(ip);
        (void) chkdq(ip, change, 1);
@@ -373,6 +434,165 @@ chown1(vp, uid, gid, cred)
 #endif
 }
 
 #endif
 }
 
+/*
+ * Vnode op for reading.
+ */
+/* ARGSUSED */
+ufs_read(vp, uio, ioflag, cred)
+       struct vnode *vp;
+       register struct uio *uio;
+       int ioflag;
+       struct ucred *cred;
+{
+       register struct inode *ip = VTOI(vp);
+       register struct fs *fs;
+       struct buf *bp;
+       daddr_t lbn, bn, rablock;
+       int size, rasize, diff, error = 0;
+       long n, on, type;
+
+       if (uio->uio_rw != UIO_READ)
+               panic("ufs_read mode");
+       type = ip->i_mode & IFMT;
+       if (type != IFDIR && type != IFREG && type != IFLNK)
+               panic("ufs_read type");
+       if (uio->uio_resid == 0)
+               return (0);
+       if (uio->uio_offset < 0)
+               return (EINVAL);
+       ip->i_flag |= IACC;
+       fs = ip->i_fs;
+       do {
+               lbn = lblkno(fs, uio->uio_offset);
+               on = blkoff(fs, uio->uio_offset);
+               n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
+               diff = ip->i_size - uio->uio_offset;
+               if (diff <= 0)
+                       return (0);
+               if (diff < n)
+                       n = diff;
+               if (error = bmap(ip, lbn, &bn, &rablock, &rasize))
+                       return (error);
+               size = blksize(fs, ip, lbn);
+               if ((long)bn < 0) {
+                       bp = geteblk(size);
+                       clrbuf(bp);
+               } else if (ip->i_lastr + 1 == lbn)
+                       error = breada(ip->i_devvp, bn, size, rablock, rasize,
+                               NOCRED, &bp);
+               else
+                       error = bread(ip->i_devvp, bn, size, NOCRED, &bp);
+               ip->i_lastr = lbn;
+               n = MIN(n, size - bp->b_resid);
+               if (error) {
+                       brelse(bp);
+                       return (error);
+               }
+               error = uiomove(bp->b_un.b_addr + on, (int)n, uio);
+               if (n + on == fs->fs_bsize || uio->uio_offset == ip->i_size)
+                       bp->b_flags |= B_AGE;
+               brelse(bp);
+       } while (error == 0 && uio->uio_resid > 0 && n != 0);
+       return (error);
+}
+
+/*
+ * Vnode op for writing.
+ */
+ufs_write(vp, uio, ioflag, cred)
+       register struct vnode *vp;
+       struct uio *uio;
+       int ioflag;
+       struct ucred *cred;
+{
+       register struct inode *ip = VTOI(vp);
+       register struct fs *fs;
+       struct buf *bp;
+       daddr_t lbn, bn;
+       u_long osize;
+       int i, n, on, flags;
+       int count, size, resid, error = 0;
+
+       if (uio->uio_rw != UIO_WRITE)
+               panic("ufs_write mode");
+       switch (vp->v_type) {
+       case VREG:
+               if (ioflag & IO_APPEND)
+                       uio->uio_offset = ip->i_size;
+               /* fall through */
+       case VLNK:
+               break;
+
+       case VDIR:
+               if ((ioflag & IO_SYNC) == 0)
+                       panic("ufs_write nonsync dir write");
+               break;
+
+       default:
+               panic("ufs_write type");
+       }
+       if (uio->uio_offset < 0)
+               return (EINVAL);
+       if (uio->uio_resid == 0)
+               return (0);
+       /*
+        * Maybe this should be above the vnode op call, but so long as
+        * file servers have no limits, i don't think it matters
+        */
+       if (vp->v_type == VREG &&
+           uio->uio_offset + uio->uio_resid >
+             u.u_rlimit[RLIMIT_FSIZE].rlim_cur) {
+               psignal(u.u_procp, SIGXFSZ);
+               return (EFBIG);
+       }
+       resid = uio->uio_resid;
+       osize = ip->i_size;
+       fs = ip->i_fs;
+       do {
+               lbn = lblkno(fs, uio->uio_offset);
+               on = blkoff(fs, uio->uio_offset);
+               n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
+               if (n < fs->fs_bsize)
+                       flags = B_CLRBUF;
+               else
+                       flags = 0;
+               if (error = balloc(ip, lbn, (int)(on + n), &bn, flags))
+                       break;
+               if (uio->uio_offset + n > ip->i_size)
+                       ip->i_size = uio->uio_offset + n;
+               size = blksize(fs, ip, lbn);
+               count = howmany(size, CLBYTES);
+               for (i = 0; i < count; i++)
+                       munhash(ip->i_devvp, bn + i * CLBYTES / DEV_BSIZE);
+               if (n == fs->fs_bsize)
+                       bp = getblk(ip->i_devvp, bn, size);
+               else
+                       error = bread(ip->i_devvp, bn, size, NOCRED, &bp);
+               n = MIN(n, size - bp->b_resid);
+               if (error) {
+                       brelse(bp);
+                       break;
+               }
+               error = uiomove(bp->b_un.b_addr + on, n, uio);
+               if (ioflag & IO_SYNC)
+                       (void) bwrite(bp);
+               else if (n + on == fs->fs_bsize) {
+                       bp->b_flags |= B_AGE;
+                       bawrite(bp);
+               } else
+                       bdwrite(bp);
+               ip->i_flag |= IUPD|ICHG;
+               if (cred->cr_uid != 0)
+                       ip->i_mode &= ~(ISUID|ISGID);
+       } while (error == 0 && uio->uio_resid > 0 && n != 0);
+       if (error && (ioflag & IO_UNIT)) {
+               (void) itrunc(ip, osize);
+               uio->uio_offset -= resid - uio->uio_resid;
+               uio->uio_resid = resid;
+       }
+       return (error);
+}
+
 /* ARGSUSED */
 ufs_ioctl(vp, com, data, fflag, cred)
        struct vnode *vp;
 /* ARGSUSED */
 ufs_ioctl(vp, com, data, fflag, cred)
        struct vnode *vp;
@@ -382,7 +602,6 @@ ufs_ioctl(vp, com, data, fflag, cred)
        struct ucred *cred;
 {
 
        struct ucred *cred;
 {
 
-       printf("ufs_ioctl called with type %d\n", vp->v_type);
        return (ENOTTY);
 }
 
        return (ENOTTY);
 }
 
@@ -393,7 +612,6 @@ ufs_select(vp, which, cred)
        struct ucred *cred;
 {
 
        struct ucred *cred;
 {
 
-       printf("ufs_select called with type %d\n", vp->v_type);
        return (1);             /* XXX */
 }
 
        return (1);             /* XXX */
 }
 
@@ -416,20 +634,17 @@ ufs_mmap(vp, fflags, cred)
  * Synch an open file.
  */
 /* ARGSUSED */
  * Synch an open file.
  */
 /* ARGSUSED */
-ufs_fsync(vp, fflags, cred)
+ufs_fsync(vp, fflags, cred, waitfor)
        struct vnode *vp;
        int fflags;
        struct ucred *cred;
        struct vnode *vp;
        int fflags;
        struct ucred *cred;
+       int waitfor;
 {
 {
-       register struct inode *ip = VTOI(vp);
-       int error;
+       struct inode *ip = VTOI(vp);
 
 
-       ILOCK(ip);
        if (fflags&FWRITE)
                ip->i_flag |= ICHG;
        if (fflags&FWRITE)
                ip->i_flag |= ICHG;
-       error = syncip(ip);
-       IUNLOCK(ip);
-       return (error);
+       return (syncip(ip, waitfor));
 }
 
 /*
 }
 
 /*
@@ -596,7 +811,7 @@ ufs_rename(fndp, tndp)
                do {
                        dp = VTOI(tndp->ni_dvp);
                        if (xp != NULL)
                do {
                        dp = VTOI(tndp->ni_dvp);
                        if (xp != NULL)
-                               vput(ITOV(xp));
+                               iput(xp);
                        if (error = checkpath(ip, dp, tndp->ni_cred))
                                goto out;
                        if (error = namei(tndp))
                        if (error = checkpath(ip, dp, tndp->ni_cred))
                                goto out;
                        if (error = namei(tndp))
@@ -690,7 +905,7 @@ ufs_rename(fndp, tndp)
                        error = itrunc(xp, (u_long)0);
                }
                xp->i_flag |= ICHG;
                        error = itrunc(xp, (u_long)0);
                }
                xp->i_flag |= ICHG;
-               vput(ITOV(xp));
+               iput(xp);
                xp = NULL;
        }
 
                xp = NULL;
        }
 
@@ -703,6 +918,8 @@ ufs_rename(fndp, tndp)
                xp = VTOI(fndp->ni_vp);
                dp = VTOI(fndp->ni_dvp);
        } else {
                xp = VTOI(fndp->ni_vp);
                dp = VTOI(fndp->ni_dvp);
        } else {
+               if (fndp->ni_dvp != NULL)
+                       vput(fndp->ni_dvp);
                xp = NULL;
                dp = NULL;
        }
                xp = NULL;
                dp = NULL;
        }
@@ -729,20 +946,22 @@ ufs_rename(fndp, tndp)
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
                if (doingdirectory && newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= ICHG;
-                       error = rdwri(UIO_READ, xp, (caddr_t)&dirbuf,
+                       error = vn_rdwr(UIO_READ, ITOV(xp), (caddr_t)&dirbuf,
                                sizeof (struct dirtemplate), (off_t)0,
                                sizeof (struct dirtemplate), (off_t)0,
-                               UIO_SYSSPACE, tndp->ni_cred, (int *)0);
+                               UIO_SYSSPACE, IO_NODELOCKED, 
+                               tndp->ni_cred, (int *)0);
                        if (error == 0) {
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
                        if (error == 0) {
                                if (dirbuf.dotdot_namlen != 2 ||
                                    dirbuf.dotdot_name[0] != '.' ||
                                    dirbuf.dotdot_name[1] != '.') {
-                                       printf("rename: mangled dir\n");
+                                       dirbad(xp, 12, "rename: mangled dir");
                                } else {
                                        dirbuf.dotdot_ino = newparent;
                                } else {
                                        dirbuf.dotdot_ino = newparent;
-                                       (void) rdwri(UIO_WRITE, xp,
+                                       (void) vn_rdwr(UIO_WRITE, ITOV(xp),
                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),
                                            (off_t)0, UIO_SYSSPACE,
                                            (caddr_t)&dirbuf,
                                            sizeof (struct dirtemplate),
                                            (off_t)0, UIO_SYSSPACE,
+                                           IO_NODELOCKED|IO_SYNC,
                                            tndp->ni_cred, (int *)0);
                                        cache_purge(ITOV(dp));
                                }
                                            tndp->ni_cred, (int *)0);
                                        cache_purge(ITOV(dp));
                                }
@@ -844,9 +1063,9 @@ ufs_mkdir(ndp, vap)
        dirtemplate = mastertemplate;
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;
        dirtemplate = mastertemplate;
        dirtemplate.dot_ino = ip->i_number;
        dirtemplate.dotdot_ino = dp->i_number;
-       error = rdwri(UIO_WRITE, ip, (caddr_t)&dirtemplate,
+       error = vn_rdwr(UIO_WRITE, ITOV(ip), (caddr_t)&dirtemplate,
                sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
                sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
-               ndp->ni_cred, (int *)0);
+               IO_NODELOCKED|IO_SYNC, ndp->ni_cred, (int *)0);
        if (error) {
                dp->i_nlink--;
                dp->i_flag |= ICHG;
        if (error) {
                dp->i_nlink--;
                dp->i_flag |= ICHG;
@@ -881,8 +1100,9 @@ bad:
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;
        if (error) {
                ip->i_nlink = 0;
                ip->i_flag |= ICHG;
-       }
-       iput(ip);
+               iput(ip);
+       } else
+               ndp->ni_vp = ITOV(ip);
        if (dp)
                iput(dp);
        return (error);
        if (dp)
                iput(dp);
        return (error);
@@ -965,8 +1185,8 @@ ufs_symlink(ndp, vap, target)
        error = maknode(IFLNK | vap->va_mode, ndp, &ip);
        if (error)
                return (error);
        error = maknode(IFLNK | vap->va_mode, ndp, &ip);
        if (error)
                return (error);
-       error = rdwri(UIO_WRITE, ip, target, strlen(target), (off_t)0,
-               UIO_SYSSPACE, ndp->ni_cred, (int *)0);
+       error = vn_rdwr(UIO_WRITE, ITOV(ip), target, strlen(target), (off_t)0,
+               UIO_SYSSPACE, IO_NODELOCKED, ndp->ni_cred, (int *)0);
        iput(ip);
        return (error);
 }
        iput(ip);
        return (error);
 }
@@ -974,29 +1194,22 @@ ufs_symlink(ndp, vap, target)
 /*
  * Vnode op for read and write
  */
 /*
  * Vnode op for read and write
  */
-ufs_readdir(vp, uio, offp, cred)
+ufs_readdir(vp, uio, cred)
        struct vnode *vp;
        register struct uio *uio;
        struct vnode *vp;
        register struct uio *uio;
-       off_t *offp;
        struct ucred *cred;
 {
        struct ucred *cred;
 {
-       register struct inode *ip = VTOI(vp);
-       int count, error;
+       int count, lost, error;
 
 
-       ILOCK(ip);
-       uio->uio_offset = *offp;
        count = uio->uio_resid;
        count &= ~(DIRBLKSIZ - 1);
        count = uio->uio_resid;
        count &= ~(DIRBLKSIZ - 1);
-       if (vp->v_type != VDIR || uio->uio_iovcnt != 1 ||
-           (count < DIRBLKSIZ) || (uio->uio_offset & (DIRBLKSIZ -1))) {
-               IUNLOCK(ip);
+       lost = uio->uio_resid - count;
+       if (count < DIRBLKSIZ || (uio->uio_offset & (DIRBLKSIZ -1)))
                return (EINVAL);
                return (EINVAL);
-       }
        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;
        uio->uio_resid = count;
        uio->uio_iov->iov_len = count;
-       error = readip(ip, uio, cred);
-       *offp += count - uio->uio_resid;
-       IUNLOCK(ip);
+       error = ufs_read(vp, uio, 0, cred);
+       uio->uio_resid += lost;
        return (error);
 }
 
        return (error);
 }
 
@@ -1009,7 +1222,7 @@ ufs_readlink(vp, uiop, cred)
        struct ucred *cred;
 {
 
        struct ucred *cred;
 {
 
-       return (readip(VTOI(vp), uiop, cred));
+       return (ufs_read(vp, uiop, 0, cred));
 }
 
 /*
 }
 
 /*