From: Jim Meyering <meyering@redhat.com>
Date: Fri, 6 Jun 2008 16:20:14 +0000 (+0200)
Subject: utimens.c: correct kernel bug work-around
X-Git-Tag: v0.1~7284
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=98401994e4061fc54b2a94fa254a42c9dd01ce3c;p=gnulib.git

utimens.c: correct kernel bug work-around

Ondřej Vašík found that the invalid return value of 280 indicates
failure, not success, and the kernel bug we're trying to work
around affects not just the utimensat call, but also the fallback
futimens call.
* lib/utimens.c (gl_futimens) [HAVE_UTIMENSAT]: Simulate failure,
not success.
[HAVE_FUTIMENS]: Use the same work-around, here.
---

diff --git a/ChangeLog b/ChangeLog
index 07026ff14..8eb88b0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-09  Jim Meyering  <meyering@redhat.com>
+	and Ondřej Vašík  <ovasik@redhat.com>
+
+	utimens.c: correct kernel bug work-around
+	Ondřej Vašík found that the invalid return value of 280 indicates
+	failure, not success, and the kernel bug we're trying to work
+	around affects not just the utimensat call, but also the fallback
+	futimens call.
+	* lib/utimens.c (gl_futimens) [HAVE_UTIMENSAT]: Simulate failure,
+	not success.
+	[HAVE_FUTIMENS]: Use the same work-around, here.
+
 2008-06-08  Bruno Haible  <bruno@clisp.org>
 
 	* lib/acl-internal.h: Add me as co-author.
diff --git a/lib/utimens.c b/lib/utimens.c
index d80445cbc..708de1098 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -103,17 +103,17 @@ gl_futimens (int fd ATTRIBUTE_UNUSED,
   if (fd < 0)
     {
       int result = utimensat (AT_FDCWD, file, timespec, 0);
-#ifdef __linux__
+# ifdef __linux__
       /* Work around what might be a kernel bug:
          http://bugzilla.redhat.com/442352
          http://bugzilla.redhat.com/449910
          It appears that utimensat can mistakenly return 280 rather
-         than 0 to indicate success.
+         than -1 upon failure.
          FIXME: remove in 2010 or whenever the offending kernels
          are no longer in common use.  */
       if (0 < result)
-        result = 0;
-#endif
+        errno = ENOSYS;
+# endif
 
       if (result == 0 || errno != ENOSYS)
         return result;
@@ -122,6 +122,11 @@ gl_futimens (int fd ATTRIBUTE_UNUSED,
 #if HAVE_FUTIMENS
   {
     int result = futimens (fd, timespec);
+# ifdef __linux__
+    /* Work around the same bug as above.  */
+    if (0 < result)
+      errno = ENOSYS;
+# endif
     if (result == 0 || errno != ENOSYS)
       return result;
   }