From f348c78f97527e7a49859fa7e7ee29dd6b37dfb2 Mon Sep 17 00:00:00 2001 From: Matthew Macy Date: Sat, 30 Nov 2019 15:40:22 -0800 Subject: [PATCH] Mark Linux fallocate extensions as specific to Linux fallocate(2) is a Linux-specific system call which in unavailable on other platforms. Reviewed-by: Jorgen Lundman Reviewed-by: Brian Behlendorf Signed-off-by: Matt Macy Closes #9633 --- lib/libzpool/kernel.c | 4 ++++ module/os/linux/zfs/vdev_file.c | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c index 6123b5d6ab10..cd6553eebe07 100644 --- a/lib/libzpool/kernel.c +++ b/lib/libzpool/kernel.c @@ -1346,7 +1346,11 @@ zfs_file_fsync(zfs_file_t *fp, int flags) int zfs_file_fallocate(zfs_file_t *fp, int mode, loff_t offset, loff_t len) { +#ifdef __linux__ return (fallocate(fp->f_fd, mode, offset, len)); +#else + return (EOPNOTSUPP); +#endif } /* diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c index fba5cdcedd9b..592ba2b4a5c0 100644 --- a/module/os/linux/zfs/vdev_file.c +++ b/module/os/linux/zfs/vdev_file.c @@ -36,9 +36,9 @@ #include #include #include - +#ifdef _KERNEL #include - +#endif /* * Virtual device vector for files. */ @@ -268,10 +268,12 @@ vdev_file_io_start(zio_t *zio) zio_execute(zio); return; } else if (zio->io_type == ZIO_TYPE_TRIM) { - int mode; + int mode = 0; ASSERT3U(zio->io_size, !=, 0); +#ifdef __linux__ mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; +#endif zio->io_error = zfs_file_fallocate(vf->vf_file, mode, zio->io_offset, zio->io_size); zio_execute(zio);