diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
| commit | abede2744bbad7139d9bd3435f5f7ca1d4e85e51 (patch) | |
| tree | 8db1f2051b877c6f22dc49bb6d13be81d4235ec4 /sys/ufs/lfs/lfs_vnops.c | |
| parent | ec6ef49763f047e88c3866301e0e71dc29900b97 (diff) | |
Integrate new ext2fs, reverting ufs support for the old one.
Diffstat (limited to 'sys/ufs/lfs/lfs_vnops.c')
| -rw-r--r-- | sys/ufs/lfs/lfs_vnops.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 76bc7608ed1..9e40dbf1b8d 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_vnops.c,v 1.4 1996/07/01 07:41:56 downsj Exp $ */ +/* $OpenBSD: lfs_vnops.c,v 1.5 1997/05/30 08:34:51 downsj Exp $ */ /* $NetBSD: lfs_vnops.c,v 1.11 1996/05/11 18:27:41 mycroft Exp $ */ /* @@ -416,7 +416,7 @@ lfs_rename(v) SET_ENDOP(VTOI(ap->a_fdvp)->i_lfs); return (ret); } -/* XXX hack to avoid calling ITIMES in getattr */ +/* XXX hack to avoid calling FFS_ITIMES in getattr */ int lfs_getattr(v) void *v; @@ -435,20 +435,20 @@ lfs_getattr(v) */ vap->va_fsid = ip->i_dev; vap->va_fileid = ip->i_number; - vap->va_mode = ip->i_mode & ~IFMT; - vap->va_nlink = ip->i_nlink; - 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_din.di_size; - vap->va_atime.tv_sec = ip->i_atime; - vap->va_atime.tv_nsec = ip->i_atimensec; - vap->va_mtime.tv_sec = ip->i_mtime; - vap->va_mtime.tv_nsec = ip->i_mtimensec; - vap->va_ctime.tv_sec = ip->i_ctime; - vap->va_ctime.tv_nsec = ip->i_ctimensec; - vap->va_flags = ip->i_flags; - vap->va_gen = ip->i_gen; + vap->va_mode = ip->i_ffs_mode & ~IFMT; + vap->va_nlink = ip->i_ffs_nlink; + vap->va_uid = ip->i_ffs_uid; + vap->va_gid = ip->i_ffs_gid; + vap->va_rdev = (dev_t)ip->i_ffs_rdev; + vap->va_size = ip->i_ffs_size; + vap->va_atime.tv_sec = ip->i_ffs_atime; + vap->va_atime.tv_nsec = ip->i_ffs_atimensec; + vap->va_mtime.tv_sec = ip->i_ffs_mtime; + vap->va_mtime.tv_nsec = ip->i_ffs_mtimensec; + vap->va_ctime.tv_sec = ip->i_ffs_ctime; + vap->va_ctime.tv_nsec = ip->i_ffs_ctimensec; + vap->va_flags = ip->i_ffs_flags; + vap->va_gen = ip->i_ffs_gen; /* this doesn't belong here */ if (vp->v_type == VBLK) vap->va_blocksize = BLKDEV_IOSIZE; @@ -456,7 +456,7 @@ lfs_getattr(v) vap->va_blocksize = MAXBSIZE; else vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize; - vap->va_bytes = dbtob(ip->i_blocks); + vap->va_bytes = dbtob(ip->i_ffs_blocks); vap->va_type = vp->v_type; vap->va_filerev = ip->i_modrev; return (0); @@ -485,7 +485,7 @@ lfs_close(v) if (vp->v_usecount > 1 && !(ip->i_flag & IN_LOCKED)) { mod = ip->i_flag & IN_MODIFIED; - ITIMES(ip, &time, &time); + FFS_ITIMES(ip, &time, &time); if (!mod && ip->i_flag & IN_MODIFIED) ip->i_lfs->lfs_uinodes++; } |