svn commit: r294971 - stable/9/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Thu Jan 28 02:21:20 2016
New Revision: 294971
URL: https://svnweb.freebsd.org/changeset/base/294971

Log:
  MFC	r294695:
  ext2fs: passthrough any extra timestamps to the dinode struct.
  
  In general we don't trust any of the extended timestamps unless the
  EXT2F_ROCOMPAT_EXTRA_ISIZE feature is set. However, in the case where
  we freshly allocated a new inode the information is valid and it is
  better to pass it along instead of leaving the value undefined.
  
  This should have no practical effect but should reduce the amount of
  garbage if EXT2F_ROCOMPAT_EXTRA_ISIZE is set, like in cases where the
  filesystem is converted from ext3 to ext4.

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

Modified: stable/9/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_inode_cnv.c	Thu Jan 28 02:19:47 2016	(r294970)
+++ stable/9/sys/fs/ext2fs/ext2_inode_cnv.c	Thu Jan 28 02:21:20 2016	(r294971)
@@ -149,13 +149,11 @@ 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;
-	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_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;