delete VERBOSE #ifdef's

[unix-history] / usr / src / sys / ufs / lfs / lfs_alloc.c

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index ff215a5..09c0a5d 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_alloc.c 7.41 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 7.51 (Berkeley) %G%

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


@@ -15,6 +15,8 @@
 #include <sys/mount.h>
 #include <sys/malloc.h>
 
 #include <sys/mount.h>
 #include <sys/malloc.h>
 

+#include <vm/vm.h>
+

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


@@ -27,10 +29,13 @@ extern u_long nextgennumber;
 /* Allocate a new inode. */
 /* ARGSUSED */
 int
 /* Allocate a new inode. */
 /* ARGSUSED */
 int

-lfs_valloc(pvp, notused, cred, vpp)
-       struct vnode *pvp, **vpp;
-       int notused;
-       struct ucred *cred;
+lfs_valloc(ap)
+       struct vop_valloc_args /* {
+               struct vnode *a_pvp;
+               int a_mode;
+               struct ucred *a_cred;
+               struct vnode **a_vpp;
+       } */ *ap;

 {
        struct lfs *fs;
        struct buf *bp;
 {
        struct lfs *fs;
        struct buf *bp;


@@ -42,11 +47,8 @@ lfs_valloc(pvp, notused, cred, vpp)
        u_long i, max;
        int error;
 
        u_long i, max;
        int error;
 

-#ifdef VERBOSE
-       printf("lfs_valloc\n");
-#endif

        /* Get the head of the freelist. */
        /* Get the head of the freelist. */

-       fs = VTOI(pvp)->i_lfs;
+       fs = VTOI(ap->a_pvp)->i_lfs;

        new_ino = fs->lfs_free;
 #ifdef ALLOCPRINT
        printf("lfs_ialloc: allocate inode %d\n", new_ino);
        new_ino = fs->lfs_free;
 #ifdef ALLOCPRINT
        printf("lfs_ialloc: allocate inode %d\n", new_ino);


@@ -67,20 +69,17 @@ lfs_valloc(pvp, notused, cred, vpp)
                vp = fs->lfs_ivnode;
                ip = VTOI(vp);
                blkno = lblkno(fs, ip->i_size);
                vp = fs->lfs_ivnode;
                ip = VTOI(vp);
                blkno = lblkno(fs, ip->i_size);

-printf("Extending ifile: blkno = %d\n", blkno);

                bp = getblk(vp, blkno, fs->lfs_bsize);
                if (!bp) {
                        uprintf("\n%s: no inodes left\n", fs->lfs_fsmnt);
                        log(LOG_ERR, "uid %d on %s: out of inodes\n",
                bp = getblk(vp, blkno, fs->lfs_bsize);
                if (!bp) {
                        uprintf("\n%s: no inodes left\n", fs->lfs_fsmnt);
                        log(LOG_ERR, "uid %d on %s: out of inodes\n",

-                           cred->cr_uid, fs->lfs_fsmnt);
+                           ap->a_cred->cr_uid, fs->lfs_fsmnt);

                        return (ENOSPC);
                }
                i = (blkno - fs->lfs_segtabsz - fs->lfs_cleansz) *
                    fs->lfs_ifpb;
                        return (ENOSPC);
                }
                i = (blkno - fs->lfs_segtabsz - fs->lfs_cleansz) *
                    fs->lfs_ifpb;

-printf("Extending ifile: first inum = %d\n", i);

                fs->lfs_free = i;
                max = i + fs->lfs_ifpb;
                fs->lfs_free = i;
                max = i + fs->lfs_ifpb;

-printf("Extending ifile: max inum = %d\n", max);

                for (ifp = (struct ifile *)bp->b_un.b_words; i < max; ++ifp) {
                        ifp->if_version = 1;
                        ifp->if_daddr = LFS_UNUSED_DADDR;
                for (ifp = (struct ifile *)bp->b_un.b_words; i < max; ++ifp) {
                        ifp->if_version = 1;
                        ifp->if_daddr = LFS_UNUSED_DADDR;


@@ -89,18 +88,19 @@ printf("Extending ifile: max inum = %d\n", max);
                ifp--;
                ifp->if_nextfree = LFS_UNUSED_INUM;
 
                ifp--;
                ifp->if_nextfree = LFS_UNUSED_INUM;
 

-               ++ip->i_blocks;                 /* XXX This may not be right. */
+               ip->i_blocks += btodb(fs->lfs_bsize);
+               fs->lfs_bfree -= btodb(fs->lfs_bsize);

                ip->i_size += fs->lfs_bsize;
                ip->i_size += fs->lfs_bsize;

-printf("Extending ifile: blocks = %d size = %d\n", ip->i_blocks, ip->i_size);
-               vnode_pager_setsize(vp, ip->i_size);
+               vnode_pager_setsize(vp, (u_long)ip->i_size);

                vnode_pager_uncache(vp);
                LFS_UBWRITE(bp);
        }
 
        /* Create a vnode to associate with the inode. */
                vnode_pager_uncache(vp);
                LFS_UBWRITE(bp);
        }
 
        /* Create a vnode to associate with the inode. */

-       if (error = lfs_vcreate(pvp->v_mount, new_ino, &vp))
+       if (error = lfs_vcreate(ap->a_pvp->v_mount, new_ino, &vp))

                return (error);
                return (error);

-       *vpp = vp;
+       *ap->a_vpp = vp;
+       vp->v_flag |= VDIROP;

        ip = VTOI(vp);
        VREF(ip->i_devvp);
 
        ip = VTOI(vp);
        VREF(ip->i_devvp);
 


@@ -128,16 +128,13 @@ lfs_vcreate(mp, ino, vpp)
        ino_t ino;
        struct vnode **vpp;
 {
        ino_t ino;
        struct vnode **vpp;
 {

-       extern struct vnodeops lfs_vnodeops;
+       extern int (**lfs_vnodeop_p)();

        struct inode *ip;
        struct ufsmount *ump;
        int error, i;
 
        struct inode *ip;
        struct ufsmount *ump;
        int error, i;
 

-#ifdef VERBOSE
-       printf("lfs_vcreate: ino %d\n", ino);
-#endif

        /* Create the vnode. */
        /* Create the vnode. */

-       if (error = getnewvnode(VT_LFS, mp, &lfs_vnodeops, vpp)) {
+       if (error = getnewvnode(VT_LFS, mp, lfs_vnodeop_p, vpp)) {

                *vpp = NULL;
                return (error);
        }
                *vpp = NULL;
                return (error);
        }


@@ -162,16 +159,19 @@ lfs_vcreate(mp, ino, vpp)
        ip->i_diroff = 0;
        ip->i_mode = 0;
        ip->i_size = 0;
        ip->i_diroff = 0;
        ip->i_mode = 0;
        ip->i_size = 0;

+       ip->i_blocks = 0;

        return (0);
 }
 
 /* Free an inode. */
 /* ARGUSED */
        return (0);
 }
 
 /* Free an inode. */
 /* ARGUSED */

-void
-lfs_vfree(vp, notused1, notused2)
-       struct vnode *vp;
-       ino_t notused1;
-       int notused2;
+int
+lfs_vfree(ap)
+       struct vop_vfree_args /* {
+               struct vnode *a_pvp;
+               ino_t a_ino;
+               int a_mode;
+       } */ *ap;

 {
        SEGUSE *sup;
        struct buf *bp;
 {
        SEGUSE *sup;
        struct buf *bp;


@@ -181,11 +181,8 @@ lfs_vfree(vp, notused1, notused2)
        daddr_t old_iaddr;
        ino_t ino;
 
        daddr_t old_iaddr;
        ino_t ino;
 

-       ip = VTOI(vp);
-#ifdef VERBOSE
-       printf("lfs_vfree: free %d\n", ip->i_number);
-#endif

        /* Get the inode number and file system. */
        /* Get the inode number and file system. */

+       ip = VTOI(ap->a_pvp);

        fs = ip->i_lfs;
        ino = ip->i_number;
 
        fs = ip->i_lfs;
        ino = ip->i_number;
 


@@ -215,4 +212,5 @@ lfs_vfree(vp, notused1, notused2)
        /* Set superblock modified bit and decrement file count. */
        fs->lfs_fmod = 1;
        --fs->lfs_nfiles;
        /* Set superblock modified bit and decrement file count. */
        fs->lfs_fmod = 1;
        --fs->lfs_nfiles;

+       return (0);

 }
 }