X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Futime.c;h=43a50e62754aaffed2dd090ef742bacd71624877;hb=13488a1a51eb88662e4edb38d520d26a77300287;hp=c6a5d7dc8e0a43a09dd7662dcf82cffc3850a48b;hpb=576c9a8212bc6607146d99e3413f7a24cbf91b5c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/utime.c b/lustre/tests/utime.c
index c6a5d7d..43a50e6 100644
--- a/lustre/tests/utime.c
+++ b/lustre/tests/utime.c
@@ -21,16 +21,27 @@ void usage(char *prog)
 int main(int argc, char *argv[])
 {
 	long before_mknod, after_mknod;
-	long before_utime, after_utime;
 	const char *prog = argv[0];
 	const char *filename = argv[1];
+        struct utimbuf utb;
 	struct stat st;
 	int rc;
 
+        utb.actime = 0x47114711;
+        utb.modtime = 0x11471147;
+                
+
 	if (argc != 2)
 		usage(argv[0]);
 
-	before_mknod = time(0);
+	/* Adjust the before time back one second, because the kernel's
+	 * CURRENT_TIME (lockless clock reading, used to set inode times)
+	 * may drift against the do_gettimeofday() time (TSC-corrected and
+	 * locked clock reading, used to return timestamps to user space).
+	 * This means that the mknod time could be a second older than the
+	 * before time, even for a local filesystem such as ext3.
+	 */
+	before_mknod = time(0) - 1;
 	rc = mknod(filename, 0700, S_IFREG);
 	after_mknod = time(0);
 	if (rc && errno != EEXIST) {
@@ -52,15 +63,14 @@ int main(int argc, char *argv[])
 			return 4;
 		}
 
-		printf("%s: good mknod times %lu <= %lu <= %lu\n",
-		       prog, before_mknod, st.st_mtime, after_mknod);
+		printf("%s: good mknod times %lu%s <= %lu <= %lu\n",
+		       prog, before_mknod, before_mknod == st.st_mtime ? "*":"",
+		       st.st_mtime, after_mknod);
 
-		sleep(5);
 	}
 
-	before_utime = time(0);
-	rc = utime(filename, NULL);
-	after_utime = time(0);
+	/* See above */
+	rc = utime(filename, &utb);
 	if (rc) {
 		fprintf(stderr, "%s: utime(%s) failed: rc %d: %s\n",
 			prog, filename, errno, strerror(errno));
@@ -74,14 +84,20 @@ int main(int argc, char *argv[])
 		return 6;
 	}
 
-	if (st.st_mtime < before_utime || st.st_mtime > after_utime) {
-		fprintf(stderr, "%s: bad utime times %lu <= %lu <= %lu false\n",
-			prog, before_utime, st.st_mtime, after_utime);
+	if (st.st_mtime != utb.modtime ) {
+		fprintf(stderr, "%s: bad utime mtime %lu should be  %lu\n",
+			prog, st.st_mtime, utb.modtime);
+		return 7;
+	}
+
+	if (st.st_atime != utb.actime ) {
+		fprintf(stderr, "%s: bad utime mtime %lu should be  %lu\n",
+			prog, st.st_atime, utb.actime);
 		return 7;
 	}
 
-	printf("%s: good utime times %lu <= %lu <= %lu\n",
-	       prog, before_utime, st.st_mtime, after_utime);
+	printf("%s: good utime mtimes %lu, atime %lu\n",
+	       prog, utb.modtime, utb.actime);
 
 	return 0;
 }