svn commit: r295209 - head/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Wed Feb  3 14:31:23 2016
New Revision: 295209
URL: https://svnweb.freebsd.org/changeset/base/295209

Log:
  Revert r294695:
  ext2fs: passthrough any extra timestamps to the dinode struct.
  
  While it passed the classic testing, the change appears to have
  caused some regression and still requires some more precautions.
  
  PR:		206820
  MFC after:	3 days

Modified:
  head/sys/fs/ext2fs/ext2_inode_cnv.c

Modified: head/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_inode_cnv.c	Wed Feb  3 14:04:07 2016	(r295208)
+++ head/sys/fs/ext2fs/ext2_inode_cnv.c	Wed Feb  3 14:31:23 2016	(r295209)
@@ -149,11 +149,13 @@ ext2_i2ei(struct inode *ip, struct ext2f
 	ei->e2di_atime = ip->i_atime;
 	ei->e2di_mtime = ip->i_mtime;
 	ei->e2di_ctime = ip->i_ctime;
-	ei->e2di_ctime_extra = NSEC_TO_XTIME(ip->i_ctimensec);
-	ei->e2di_mtime_extra = NSEC_TO_XTIME(ip->i_mtimensec);
-	ei->e2di_atime_extra = NSEC_TO_XTIME(ip->i_atimensec);
-	ei->e2di_crtime = ip->i_birthtime;
-	ei->e2di_crtime_extra = NSEC_TO_XTIME(ip->i_birthnsec);
+	if (E2DI_HAS_XTIME(ip)) {
+		ei->e2di_ctime_extra = NSEC_TO_XTIME(ip->i_ctimensec);
+		ei->e2di_mtime_extra = NSEC_TO_XTIME(ip->i_mtimensec);
+		ei->e2di_atime_extra = NSEC_TO_XTIME(ip->i_atimensec);
+		ei->e2di_crtime = ip->i_birthtime;
+		ei->e2di_crtime_extra = NSEC_TO_XTIME(ip->i_birthnsec);
+	}
 	ei->e2di_flags = 0;
 	ei->e2di_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND: 0;
 	ei->e2di_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0;