release-request-777c0f47-a42e-446a-b45c-0bb1aaa9612e-for-git_oc-release-4066915 snap-temp-L92300000070444114

Change-Id: I86f937253186d279dcd10f91fcf50b0344ac1e02

8 files changed, 15 insertions, 8 deletions

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 78bf171ff..f63a0dae7 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1279,6 +1279,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1551,5 +1552,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index be073c58b..f30904323 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -1201,6 +1201,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1268,5 +1269,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index c4bc26286..6abcc4491 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1304,6 +1304,7 @@ LIBC_O {
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 3eda5de90..0a675cec0 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1263,6 +1263,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1392,5 +1393,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index be073c58b..f30904323 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -1201,6 +1201,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1268,5 +1269,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index d8a8d2cc7..a97d4cc73 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -1261,6 +1261,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1391,5 +1392,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index be073c58b..f30904323 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -1201,6 +1201,7 @@ LIBC_O {
     getsubopt; # future
     hasmntopt; # future
     lutimes; # future
+    mallopt; # future
     mblen; # future
     msgctl; # future
     msgget; # future
@@ -1268,5 +1269,4 @@ LIBC_PLATFORM {
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;
diff --git a/tests/fcntl_test.cpp b/tests/fcntl_test.cpp
index 275a5dac7..74d367564 100644
--- a/tests/fcntl_test.cpp
+++ b/tests/fcntl_test.cpp
@@ -20,12 +20,14 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/utsname.h>
+#include <sys/vfs.h>
 
 #include "TemporaryFile.h"
 
 // Glibc v2.19 doesn't include these in fcntl.h so host builds will fail without.
 #if !defined(FALLOC_FL_PUNCH_HOLE) || !defined(FALLOC_FL_KEEP_SIZE)
 #include <linux/falloc.h>
+#include <linux/magic.h>
 #endif
 
 TEST(fcntl, fcntl_smoke) {
@@ -287,7 +289,11 @@ TEST(fcntl, falloc_punch) {
 
   if (major < 4 || (major == 4 && minor < 1)) {
     TemporaryFile tf;
-    ASSERT_EQ(-1, fallocate(tf.fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, 1));
-    ASSERT_EQ(errno, EOPNOTSUPP);
+    struct statfs sfs;
+    ASSERT_EQ(0, fstatfs(tf.fd, &sfs));
+    if (sfs.f_type == EXT4_SUPER_MAGIC) {
+      ASSERT_EQ(-1, fallocate(tf.fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, 1));
+      ASSERT_EQ(errno, EOPNOTSUPP);
+    }
   }
 }