svn commit: r295353 - stable/10/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Sat Feb  6 16:58:56 2016
New Revision: 295353
URL: https://svnweb.freebsd.org/changeset/base/295353

Log:
  MFC r295209;
  Revert r294695; passthrough any extra timestamps to the dinode struct.
  
  The original ext2fs change worked fine on disks formated with default
  values, but it was the cause of a regression when inodes are small.
  Revert it for now, while we figure out safer ways pass such values,
  
  PR:		206820
  Approved by:	re

Modified:
  stable/10/sys/fs/ext2fs/ext2_inode_cnv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- stable/10/sys/fs/ext2fs/ext2_inode_cnv.c	Sat Feb  6 15:39:04 2016	(r295352)
+++ stable/10/sys/fs/ext2fs/ext2_inode_cnv.c	Sat Feb  6 16:58:56 2016	(r295353)
@@ -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;