[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/10] block/export/fuse: Fix build failure on FreeBSD
From: |
Kevin Wolf |
Subject: |
[PULL 05/10] block/export/fuse: Fix build failure on FreeBSD |
Date: |
Tue, 1 Feb 2022 16:21:03 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
When building on FreeBSD we get:
[816/6851] Compiling C object libblockdev.fa.p/block_export_fuse.c.o
../block/export/fuse.c:628:16: error: use of undeclared identifier
'FALLOC_FL_KEEP_SIZE'
if (mode & FALLOC_FL_KEEP_SIZE) {
^
../block/export/fuse.c:651:16: error: use of undeclared identifier
'FALLOC_FL_PUNCH_HOLE'
if (mode & FALLOC_FL_PUNCH_HOLE) {
^
../block/export/fuse.c:652:22: error: use of undeclared identifier
'FALLOC_FL_KEEP_SIZE'
if (!(mode & FALLOC_FL_KEEP_SIZE)) {
^
3 errors generated.
FAILED: libblockdev.fa.p/block_export_fuse.c.o
Meson indeed reported FALLOC_FL_PUNCH_HOLE is not available:
C compiler for the host machine: cc (clang 10.0.1 "FreeBSD clang version
10.0.1")
Checking for function "fallocate" : NO
Checking for function "posix_fallocate" : YES
Header <linux/falloc.h> has symbol "FALLOC_FL_PUNCH_HOLE" : NO
Header <linux/falloc.h> has symbol "FALLOC_FL_ZERO_RANGE" : NO
...
Similarly to commit 304332039 ("block/export/fuse.c: fix musl build"),
guard the code requiring FALLOC_FL_KEEP_SIZE / FALLOC_FL_PUNCH_HOLE
definitions under CONFIG_FALLOCATE_PUNCH_HOLE #ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220201112655.344373-3-f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/export/fuse.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/export/fuse.c b/block/export/fuse.c
index d25e478c0a..fdda8e3c81 100644
--- a/block/export/fuse.c
+++ b/block/export/fuse.c
@@ -625,9 +625,11 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
inode, int mode,
return;
}
+#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
if (mode & FALLOC_FL_KEEP_SIZE) {
length = MIN(length, blk_len - offset);
}
+#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */
if (!mode) {
/* We can only fallocate at the EOF with a truncate */
@@ -648,6 +650,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
inode, int mode,
ret = fuse_do_truncate(exp, offset + length, true,
PREALLOC_MODE_FALLOC);
}
+#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
else if (mode & FALLOC_FL_PUNCH_HOLE) {
if (!(mode & FALLOC_FL_KEEP_SIZE)) {
fuse_reply_err(req, EINVAL);
@@ -662,6 +665,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t
inode, int mode,
length -= size;
} while (ret == 0 && length > 0);
}
+#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */
#ifdef CONFIG_FALLOCATE_ZERO_RANGE
else if (mode & FALLOC_FL_ZERO_RANGE) {
if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {
--
2.31.1
- [PULL 00/10] Block layer patches, Kevin Wolf, 2022/02/01
- [PULL 02/10] block: bdrv_set_backing_hd(): use drained section, Kevin Wolf, 2022/02/01
- [PULL 03/10] block/export: Fix vhost-user-blk shutdown with requests in flight, Kevin Wolf, 2022/02/01
- [PULL 04/10] block/export/fuse: Rearrange if-else-if ladder in fuse_fallocate(), Kevin Wolf, 2022/02/01
- [PULL 05/10] block/export/fuse: Fix build failure on FreeBSD,
Kevin Wolf <=
- [PULL 07/10] qsd: Document fuse's allow-other option, Kevin Wolf, 2022/02/01
- [PULL 08/10] qemu-img: Unify [-b [-F]] documentation, Kevin Wolf, 2022/02/01
- [PULL 01/10] qemu-storage-daemon: Fix typo in vhost-user-blk help, Kevin Wolf, 2022/02/01
- [PULL 10/10] block/rbd: workaround for ceph issue #53784, Kevin Wolf, 2022/02/01
- [PULL 09/10] block/rbd: fix handling of holes in .bdrv_co_block_status, Kevin Wolf, 2022/02/01
- [PULL 06/10] block.h: remove outdated comment, Kevin Wolf, 2022/02/01
- Re: [PULL 00/10] Block layer patches, Peter Maydell, 2022/02/02