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

[Pedro F. Giffuni]

Author: pfg
Date: Sun Jan 12 20:18:12 2014
New Revision: 260570
URL: http://svnweb.freebsd.org/changeset/base/260570

Log:
  Revert unrelated fix that went into r260569.
  
  The fix is good but the minimum MFC period for this change
  has not elapsed yet.

Modified:
  stable/9/sys/fs/ext2fs/ext2_inode_cnv.c

Modified: stable/9/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- stable/9/sys/fs/ext2fs/ext2_inode_cnv.c	Sun Jan 12 20:10:12 2014	(r260569)
+++ stable/9/sys/fs/ext2fs/ext2_inode_cnv.c	Sun Jan 12 20:18:12 2014	(r260570)
@@ -104,7 +104,7 @@ ext2_ei2i(struct ext2fs_dinode *ei, stru
 		ip->i_birthtime = ei->e2di_crtime;
 		ip->i_birthnsec = XTIME_TO_NSEC(ei->e2di_crtime_extra);
 	}
-	ip->i_flags = 0;
+	ip->i_flags = ei->e2di_flags;
 	ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0;
 	ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0;
 	ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0;
@@ -152,7 +152,7 @@ ext2_i2ei(struct inode *ip, struct ext2f
 		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;
 	ei->e2di_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND: 0;
 	ei->e2di_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0;
 	ei->e2di_flags |= (ip->i_flags & UF_NODUMP) ? EXT2_NODUMP: 0;