summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-12-20 12:36:01 +0000
committerdfr <dfr@FreeBSD.org>1998-12-20 12:36:01 +0000
commit7a9bc41cc4460c28c5b98d5ae215c2e4b5871332 (patch)
tree482603b707e4625af70b45c0a0345ac5398d4c70 /sys
parentdb9539dd37ea5fa266ce2a400e4c250ed063c141 (diff)
downloadFreeBSD-src-7a9bc41cc4460c28c5b98d5ae215c2e4b5871332.zip
FreeBSD-src-7a9bc41cc4460c28c5b98d5ae215c2e4b5871332.tar.gz
In ufs_setattr(), if only one of va_atime or va_mtime are != VNOVAL, then
the code set the other field in the inode to VNOVAL. This can happen sometimes on an NFS server.
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ufs/ufs_vnops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index de68d42..47578d0 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.100 1998/09/30 00:53:40 mckusick Exp $
+ * $Id: ufs_vnops.c,v 1.101 1998/12/09 02:06:27 eivind Exp $
*/
#include "opt_quota.h"
@@ -506,9 +506,9 @@ ufs_setattr(ap)
if (vap->va_mtime.tv_sec != VNOVAL)
ip->i_flag |= IN_CHANGE | IN_UPDATE;
ufs_itimes(vp);
- if (vap->va_mtime.tv_sec != VNOVAL)
- ip->i_atime = vap->va_atime.tv_sec;
if (vap->va_atime.tv_sec != VNOVAL)
+ ip->i_atime = vap->va_atime.tv_sec;
+ if (vap->va_mtime.tv_sec != VNOVAL)
ip->i_mtime = vap->va_mtime.tv_sec;
error = UFS_UPDATE(vp, (struct timeval *)0,
(struct timeval *)0, 0);
OpenPOWER on IntegriCloud