From ce571c638fc279705f1b3ed9beffd8a8b76e2955 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@googlemail.com>
Date: Mon, 9 Jun 2008 21:16:05 -0700
Subject: [PATCH] --- yaml --- r: 98439 b: refs/heads/master c:
 94c70b9ba7e9c1036284e779e2fef5be89021533 h: refs/heads/master i:   98437:
 984d29c4ae95e49418c725c02c3e5b4ff8e049c2   98435:
 6ee567d61eff29d8bc88dfa41b467a0f37ea374a   98431:
 a3b24e68464f26f7b75355186e687877ee559706 v: v3

---
 [refs]            | 2 +-
 trunk/fs/utimes.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 325b469ffd9c..79c61669ae2b 100644
--- 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
index 14d3edbb3d7c..d466bc587e6e 100644
--- 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 &&