diff options
| author | bde <bde@FreeBSD.org> | 1999-01-07 16:14:19 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-01-07 16:14:19 +0000 |
| commit | 2facf6978aee7d6b1f5ca50f86f5a3784bf8dc19 (patch) | |
| tree | 35574972d06a1d702f3f738ba45c782641845a3a /sys/ufs/ffs/ffs_inode.c | |
| parent | 9625424b5fb4fcb6b1736c570b2cdb8125017e32 (diff) | |
| download | FreeBSD-src-2facf6978aee7d6b1f5ca50f86f5a3784bf8dc19.zip FreeBSD-src-2facf6978aee7d6b1f5ca50f86f5a3784bf8dc19.tar.gz | |
Don't pass unused unused timestamp args to UFS_UPDATE() or waste
time initializing them. This almost finishes centralizing (in-core)
timestamp updates in ufs_itimes().
Diffstat (limited to 'sys/ufs/ffs/ffs_inode.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 5f6ab9c..b474bc5 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95 - * $Id: ffs_inode.c,v 1.50 1999/01/06 16:52:38 bde Exp $ + * $Id: ffs_inode.c,v 1.51 1999/01/06 18:18:06 bde Exp $ */ #include "opt_quota.h" @@ -70,10 +70,8 @@ static int ffs_indirtrunc __P((struct inode *, ufs_daddr_t, ufs_daddr_t, * set, then wait for the write to complete. */ int -ffs_update(vp, access, modify, waitfor) +ffs_update(vp, waitfor) struct vnode *vp; - struct timeval *access; - struct timeval *modify; int waitfor; { register struct fs *fs; @@ -143,7 +141,6 @@ ffs_truncate(vp, length, flags, cred, p) struct buf *bp; int offset, size, level; long count, nblocks, blocksreleased = 0; - struct timeval tv; register int i; int aflags, error, allerror; off_t osize; @@ -156,7 +153,6 @@ ffs_truncate(vp, length, flags, cred, p) return (EINVAL); if (length > fs->fs_maxfilesize) return (EFBIG); - getmicrotime(&tv); if (ovp->v_type == VLNK && (oip->i_size < ovp->v_mount->mnt_maxsymlinklen || oip->i_din.di_blocks == 0)) { #ifdef DIAGNOSTIC @@ -166,11 +162,11 @@ ffs_truncate(vp, length, flags, cred, p) bzero((char *)&oip->i_shortlink, (u_int)oip->i_size); oip->i_size = 0; oip->i_flag |= IN_CHANGE | IN_UPDATE; - return (UFS_UPDATE(ovp, &tv, &tv, 1)); + return (UFS_UPDATE(ovp, 1)); } if (oip->i_size == length) { oip->i_flag |= IN_CHANGE | IN_UPDATE; - return (UFS_UPDATE(ovp, &tv, &tv, 0)); + return (UFS_UPDATE(ovp, 0)); } #ifdef QUOTA error = getinoquota(oip); @@ -199,7 +195,7 @@ ffs_truncate(vp, length, flags, cred, p) softdep_setup_freeblocks(oip, length); vinvalbuf(ovp, 0, cred, p, 0, 0); oip->i_flag |= IN_CHANGE | IN_UPDATE; - return (ffs_update(ovp, &tv, &tv, 0)); + return (ffs_update(ovp, 0)); } } osize = oip->i_size; @@ -227,7 +223,7 @@ ffs_truncate(vp, length, flags, cred, p) else bawrite(bp); oip->i_flag |= IN_CHANGE | IN_UPDATE; - return (UFS_UPDATE(ovp, &tv, &tv, 1)); + return (UFS_UPDATE(ovp, 1)); } /* * Shorten the size of the file. If the file is not being @@ -291,7 +287,7 @@ ffs_truncate(vp, length, flags, cred, p) for (i = NDADDR - 1; i > lastblock; i--) oip->i_db[i] = 0; oip->i_flag |= IN_CHANGE | IN_UPDATE; - allerror = UFS_UPDATE(ovp, &tv, &tv, ((length > 0) ? 0 : 1)); + allerror = UFS_UPDATE(ovp, ((length > 0) ? 0 : 1)); /* * Having written the new inode to disk, save its new configuration |
