diff options
| author | bde <bde@FreeBSD.org> | 1998-07-03 18:46:52 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-03 18:46:52 +0000 |
| commit | dfd9848c30c89d2bd43b93309c934a84cc254107 (patch) | |
| tree | 9d19fdccc10074893d94a205159868f759b143ad /sys/ufs/ffs/ffs_inode.c | |
| parent | e15057ae7cfa8d8f9f129ea1ec98514ab36f269d (diff) | |
| download | FreeBSD-src-dfd9848c30c89d2bd43b93309c934a84cc254107.zip FreeBSD-src-dfd9848c30c89d2bd43b93309c934a84cc254107.tar.gz | |
Centralized in-core inode update. Update the in-core inode directly
in ufs_setattr() so that there is no need to pass timestamps to
UFS_UPDATE() (everything else just needs the current time). Ignore
the passed-in timestamps in UFS_UPDATE() and always call ufs_itimes()
(was: itimes()) to do the update. The timestamps are still passed
so that all the callers don't need to be changed yet.
Diffstat (limited to 'sys/ufs/ffs/ffs_inode.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 5297fd1..89254a2 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.42 1998/05/04 17:43:48 dyson Exp $ + * $Id: ffs_inode.c,v 1.43 1998/06/14 19:31:28 julian Exp $ */ #include "opt_quota.h" @@ -52,6 +52,7 @@ #include <ufs/ufs/quota.h> #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/inode.h> +#include <ufs/ufs/ufs_extern.h> #include <ufs/ffs/fs.h> #include <ufs/ffs/ffs_extern.h> @@ -80,29 +81,13 @@ ffs_update(vp, access, modify, waitfor) struct inode *ip; int error; + ufs_itimes(vp); ip = VTOI(vp); - if (vp->v_mount->mnt_flag & MNT_RDONLY) { - ip->i_flag &= - ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE); + if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor != MNT_WAIT) return (0); - } - if (((ip->i_flag & - (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0) && - (waitfor != MNT_WAIT)) + ip->i_flag &= ~IN_MODIFIED; + if (vp->v_mount->mnt_flag & MNT_RDONLY) return (0); - /* - * XXX: Some callers make a copy too early (before the i/o has - * completed)... - */ - if (ip->i_flag & IN_ACCESS) - ip->i_atime = access->tv_sec; - if (ip->i_flag & IN_UPDATE) { - ip->i_mtime = modify->tv_sec; - ip->i_modrev++; - } - if (ip->i_flag & IN_CHANGE) - ip->i_ctime = time_second; - ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE); fs = ip->i_fs; /* * Ensure that uid and gid are correct. This is a temporary |
