* io/Makefile (tests): Add tst-posix_fallocate.

	* io/tst-posix_fallocate.c: New file.

	* sysdeps/unix/sysv/linux/kernel-features.h: Define
	__ASSUME_FALLOCATE.

diff --git a/ChangeLog b/ChangeLog
index 72130ec..2873715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * io/Makefile (tests): Add tst-posix_fallocate.
+       * io/tst-posix_fallocate.c: New file.
+
+       * sysdeps/unix/sysv/linux/kernel-features.h: Define
+       __ASSUME_FALLOCATE.
+
 2007-07-22  Roland McGrath  <roland@frob.com>
 
        * hurd/getdport.c: Add missing copyright year update.

diff --git a/io/Makefile b/io/Makefile
index 81078ae..f4861d7 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -67,7 +67,8 @@ tests         := test-utime test-stat test-stat2 test-lfs tst-getcwd \
                   tst-openat tst-unlinkat tst-fstatat tst-futimesat \
                   tst-renameat tst-fchownat tst-fchmodat tst-faccessat \
                   tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \
-                  tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5
+                  tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \
+                  tst-posix_fallocate
 
 distribute     := ftwtest-sh
 

diff --git a/io/tst-posix_fallocate.c b/io/tst-posix_fallocate.c
new file mode 100644 (file)
index 0000000..35c6489
--- /dev/null
+++ b/io/tst-posix_fallocate.c
@@ -0,0 +1,99 @@
+#include <sys/stat.h>
+
+static void do_prepare (void);
+#define PREPARE(argc, argv) do_prepare ()
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include <test-skeleton.c>
+
+static int fd;
+
+static void
+do_prepare (void)
+{
+  fd = create_temp_file ("tst-posix_fallocate.", NULL);
+  if (fd == -1)
+    {
+      printf ("cannot create temporary file: %m\n");
+      exit (1);
+    }
+}
+
+
+static int
+do_test (void)
+{
+  struct stat64 st;
+
+  if (fstat64 (fd, &st) != 0)
+    {
+      puts ("1st fstat failed");
+      return 1;
+    }
+
+  if (st.st_size != 0)
+    {
+      puts ("file not created with size 0");
+      return 1;
+    }
+
+  if (posix_fallocate (fd, 512, 768) != 0)
+    {
+      puts ("1st posix_fallocate call failed");
+      return 1;
+    }
+
+  if (fstat64 (fd, &st) != 0)
+    {
+      puts ("2nd fstat failed");
+      return 1;
+    }
+
+  if (st.st_size != 512 + 768)
+    {
+      printf ("file size after first posix_fallocate call is %llu, expected %u\n",
+             (unsigned long long int) st.st_size, 512u + 768u);
+      return 1;
+    }
+
+  if (posix_fallocate (fd, 0, 1024) != 0)
+    {
+      puts ("2nd posix_fallocate call failed");
+      return 1;
+    }
+
+  if (fstat64 (fd, &st) != 0)
+    {
+      puts ("3rd fstat failed");
+      return 1;
+    }
+
+  if (st.st_size != 512 + 768)
+    {
+      puts ("file size changed in second posix_fallocate");
+      return 1;
+    }
+
+  if (posix_fallocate (fd, 2048, 64) != 0)
+    {
+      puts ("3rd posix_fallocate call failed");
+      return 1;
+    }
+
+  if (fstat64 (fd, &st) != 0)
+    {
+      puts ("4th fstat failed");
+      return 1;
+    }
+
+  if (st.st_size != 2048 + 64)
+    {
+      printf ("file size after first posix_fallocate call is %llu, expected %u\n",
+             (unsigned long long int) st.st_size, 2048u + 64u);
+      return 1;
+    }
+
+  close (fd);
+
+  return 0;
+}

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index f6bd906..f8116d8 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -468,3 +468,8 @@
 #if __LINUX_KERNEL_VERSION >= 0x020616
 # define __ASSUME_PRIVATE_FUTEX        1
 #endif
+
+/* Support for fallocate was added in 2.6.23.  */
+#if __LINUX_KERNEL_VERSION >= 0x020617
+# define __ASSUME_FALLOCATE    1
+#endif