mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-11 22:33:29 +08:00
ae38de2d0e
And drop the old patches, they're upstream. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 265d97d02e8ef373653c76a339869985eb3ba27a Mon Sep 17 00:00:00 2001
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Date: Tue, 10 Mar 2015 15:10:35 -0300
|
|
Subject: [PATCH] configure: add check for fallocate
|
|
|
|
We need to check for fallocate() rather than just linux/falloc.h +
|
|
FALLOC_FL_PUNCH_HOLE since in uClibc we've got both but still not
|
|
fallocate() itself since it's only implemented in newer unreleased
|
|
versions.
|
|
|
|
Status: sent upstream.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
---
|
|
configure.ac | 1 +
|
|
mkfs/f2fs_format_utils.c | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index ae451b8..900b84a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -68,6 +68,7 @@ AC_TYPE_SIZE_T
|
|
# Checks for library functions.
|
|
AC_FUNC_GETMNTENT
|
|
AC_CHECK_FUNCS_ONCE([
|
|
+ fallocate
|
|
getmntent
|
|
memset
|
|
])
|
|
diff --git a/mkfs/f2fs_format_utils.c b/mkfs/f2fs_format_utils.c
|
|
index a0f85f5..ddeafeb 100644
|
|
--- a/mkfs/f2fs_format_utils.c
|
|
+++ b/mkfs/f2fs_format_utils.c
|
|
@@ -46,7 +46,7 @@ int f2fs_trim_device()
|
|
#if defined(WITH_BLKDISCARD) && defined(BLKDISCARD)
|
|
MSG(0, "Info: Discarding device\n");
|
|
if (S_ISREG(stat_buf.st_mode)) {
|
|
-#ifdef FALLOC_FL_PUNCH_HOLE
|
|
+#if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
|
|
if (fallocate(config.fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
|
range[0], range[1]) < 0) {
|
|
MSG(0, "Info: fallocate(PUNCH_HOLE|KEEP_SIZE) is failed\n");
|
|
--
|
|
2.0.5
|
|
|