---

yaml --- r: 98439 b: refs/heads/master c: 94c70b9 h: refs/heads/master i: 98437: 984d29c 98435: 6ee567d 98431: a3b24e6 v: v3
git-mirror · Jun 23, 2008 · ce571c6 · ce571c6
1 parent 91b201f
commit ce571c6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fd0d3088d27867be68655bcab2b074f2835f60
+refs/heads/master: 94c70b9ba7e9c1036284e779e2fef5be89021533
diff --git a/trunk/fs/utimes.c b/trunk/fs/utimes.c
@@ -173,14 +173,6 @@ asmlinkage long sys_utimensat(int dfd, char __user *filename, struct timespec __
 	if (utimes) {
 		if (copy_from_user(&tstimes, utimes, sizeof(tstimes)))
 			return -EFAULT;
-		if ((tstimes[0].tv_nsec == UTIME_OMIT ||
-		     tstimes[0].tv_nsec == UTIME_NOW) &&
-		    tstimes[0].tv_sec != 0)
-			return -EINVAL;
-		if ((tstimes[1].tv_nsec == UTIME_OMIT ||
-		     tstimes[1].tv_nsec == UTIME_NOW) &&
-		    tstimes[1].tv_sec != 0)
-			return -EINVAL;
 
 		/* Nothing to do, we must not even check the path.  */
 		if (tstimes[0].tv_nsec == UTIME_OMIT &&