From: Vlad Apostolov <vapo@sgi.com>
Date: Fri, 21 Sep 2007 04:15:06 +0000 (+0000)
Subject: Fix unexpected 32 bit sign extension for linux time. It was fine for Irix.
X-Git-Tag: v1.1.0~445
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=709c7a80fda5a6814211c266aff9ccaa868bd574;hp=e222ca096a2494a16a3563b4c1300ad300684c65

Fix unexpected 32 bit sign extension for linux time. It was fine for Irix.
Merge of master-melb:xfs-cmds:29738a by kenmcd.

  pv 964111, rv lacklan - Fix unexpected 32 bit sign extension for linux time. It was fine for Irix.
---

diff --git a/dmapi/src/suite2/src/test_fileattr.c b/dmapi/src/suite2/src/test_fileattr.c
index 8210c7dc..446c3806 100644
--- a/dmapi/src/suite2/src/test_fileattr.c
+++ b/dmapi/src/suite2/src/test_fileattr.c
@@ -230,10 +230,17 @@ main(
 	/* Fill in the dm_stat blocks with lots of junk...
 	 */
 	for (i=0; i<num_files; i++) {
-	  stat_arr[i].dt_atime=(time_t)(rand()+rand()*0x10000);
-	  stat_arr[i].dt_mtime=(time_t)(rand()+rand()*0x10000);
-	  stat_arr[i].dt_ctime=(time_t)(rand()+rand()*0x10000);
-	  stat_arr[i].dt_dtime=(time_t)(rand()+rand()*0x10000);
+	  /*
+	   * XFS inode timestamp t_sec is a 32 bit signed value. rand() only
+	   * returns 15 bits of random number, and so the rand()*0x10000 is
+	   * really a rand() << 16 to populate the upper 16 bits of
+	   * the timestamp.IOWs, linux does not need this but irix does.
+	   */
+	  stat_arr[i].dt_atime=((time_t)(rand()+rand()*0x10000) & 0x7FFFFFFF);
+	  stat_arr[i].dt_mtime=((time_t)(rand()+rand()*0x10000) & 0x7FFFFFFF);
+	  stat_arr[i].dt_ctime=((time_t)(rand()+rand()*0x10000) & 0x7FFFFFFF);
+	  stat_arr[i].dt_dtime=((time_t)(rand()+rand()*0x10000) & 0x7FFFFFFF);
+
 	  stat_arr[i].dt_uid=(uid_t)(rand()+rand()*0x10000);
 	  stat_arr[i].dt_gid=(gid_t)(rand()+rand()*0x10000);
 	  stat_arr[i].dt_mode=(mode_t)((rand()%4096)+32768);