registerized vnodeop ops after vnode interface conversion

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

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index b04d639..e0037ba 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_alloc.c 7.36 (Berkeley) %G%
+ *     @(#)ffs_alloc.c 7.37 (Berkeley) %G%

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


@@ -290,6 +290,7 @@ ffs_valloc (ap)
 {
        USES_VOP_VFREE;
        USES_VOP_VGET;
 {
        USES_VOP_VFREE;
        USES_VOP_VGET;

+       register struct vnode *pvp = ap->a_pvp;

        register struct inode *pip;
        register struct fs *fs;
        register struct inode *ip;
        register struct inode *pip;
        register struct fs *fs;
        register struct inode *ip;


@@ -297,7 +298,7 @@ ffs_valloc (ap)
        int cg, error;
        
        *ap->a_vpp = NULL;
        int cg, error;
        
        *ap->a_vpp = NULL;

-       pip = VTOI(ap->a_pvp);
+       pip = VTOI(pvp);

        fs = pip->i_fs;
        if (fs->fs_cstotal.cs_nifree == 0)
                goto noinodes;
        fs = pip->i_fs;
        if (fs->fs_cstotal.cs_nifree == 0)
                goto noinodes;


@@ -312,9 +313,9 @@ ffs_valloc (ap)
        ino = (ino_t)ffs_hashalloc(pip, cg, (long)ipref, ap->a_mode, ffs_ialloccg);
        if (ino == 0)
                goto noinodes;
        ino = (ino_t)ffs_hashalloc(pip, cg, (long)ipref, ap->a_mode, ffs_ialloccg);
        if (ino == 0)
                goto noinodes;

-       error = FFS_VGET(ap->a_pvp->v_mount, ino, ap->a_vpp);
+       error = FFS_VGET(pvp->v_mount, ino, ap->a_vpp);

        if (error) {
        if (error) {

-               VOP_VFREE(ap->a_pvp, ino, ap->a_mode);
+               VOP_VFREE(pvp, ino, ap->a_mode);

                return (error);
        }
        ip = VTOI(*ap->a_vpp);
                return (error);
        }
        ip = VTOI(*ap->a_vpp);