*
* %sccs.include.redist.c%
*
- * @(#)lfs_alloc.c 7.41 (Berkeley) %G%
+ * @(#)lfs_alloc.c 7.51 (Berkeley) %G%
*/
#include <sys/param.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>
/* 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;
u_long i, max;
int error;
-#ifdef VERBOSE
- printf("lfs_valloc\n");
-#endif
/* 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);
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",
- 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;
-printf("Extending ifile: first inum = %d\n", i);
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;
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;
-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. */
- if (error = lfs_vcreate(pvp->v_mount, new_ino, &vp))
+ if (error = lfs_vcreate(ap->a_pvp->v_mount, new_ino, &vp))
return (error);
- *vpp = vp;
+ *ap->a_vpp = vp;
+ vp->v_flag |= VDIROP;
ip = VTOI(vp);
VREF(ip->i_devvp);
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;
-#ifdef VERBOSE
- printf("lfs_vcreate: ino %d\n", ino);
-#endif
/* 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);
}
ip->i_diroff = 0;
ip->i_mode = 0;
ip->i_size = 0;
+ ip->i_blocks = 0;
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;
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. */
+ ip = VTOI(ap->a_pvp);
fs = ip->i_lfs;
ino = ip->i_number;
/* Set superblock modified bit and decrement file count. */
fs->lfs_fmod = 1;
--fs->lfs_nfiles;
+ return (0);
}