diff options
| author | Rich Ercolani <rincebrain@gmail.com> | 2022-01-19 00:12:15 -0500 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2022-02-04 08:33:52 -0800 |
| commit | 8ef01afbfcd84cc69ce4ff728bdda01b03dd1589 (patch) | |
| tree | 2390cd948f74e9fe0949a45804b59ebebc8e3868 | |
| parent | 70b7b1975d70c80f9294efbf6964cfed236cf59f (diff) | |
Add support for FALLOC_FL_ZERO_RANGE
For us, I think it's always just FALLOC_FL_PUNCH_HOLE with a fake
mustache on.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
| -rw-r--r-- | config/kernel-fallocate.m4 | 17 | ||||
| -rw-r--r-- | module/os/linux/zfs/zpl_file.c | 9 |
2 files changed, 24 insertions, 2 deletions
diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4 index 7a8550f7e..815602d3e 100644 --- a/config/kernel-fallocate.m4 +++ b/config/kernel-fallocate.m4 @@ -3,6 +3,10 @@ dnl # Linux 2.6.38 - 3.x API dnl # The fallocate callback was moved from the inode_operations dnl # structure to the file_operations structure. dnl # +dnl # +dnl # Linux 3.15+ +dnl # fallocate learned a new flag, FALLOC_FL_ZERO_RANGE +dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [ ZFS_LINUX_TEST_SRC([file_fallocate], [ #include <linux/fs.h> @@ -15,12 +19,25 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [ .fallocate = test_fallocate, }; ], []) + ZFS_LINUX_TEST_SRC([falloc_fl_zero_range], [ + #include <linux/falloc.h> + ],[ + int flags __attribute__ ((unused)); + flags = FALLOC_FL_ZERO_RANGE; + ]) ]) AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [ AC_MSG_CHECKING([whether fops->fallocate() exists]) ZFS_LINUX_TEST_RESULT([file_fallocate], [ AC_MSG_RESULT(yes) + AC_MSG_CHECKING([whether FALLOC_FL_ZERO_RANGE exists]) + ZFS_LINUX_TEST_RESULT([falloc_fl_zero_range], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FALLOC_FL_ZERO_RANGE, 1, [FALLOC_FL_ZERO_RANGE is defined]) + ],[ + AC_MSG_RESULT(no) + ]) ],[ ZFS_LINUX_TEST_ERROR([file_fallocate]) ]) diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c index 7e88eae33..f1241c443 100644 --- a/module/os/linux/zfs/zpl_file.c +++ b/module/os/linux/zfs/zpl_file.c @@ -745,7 +745,12 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len) fstrans_cookie_t cookie; int error = 0; - if ((mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) != 0) + int test_mode = FALLOC_FL_PUNCH_HOLE; +#ifdef HAVE_FALLOC_FL_ZERO_RANGE + test_mode |= FALLOC_FL_ZERO_RANGE; +#endif + + if ((mode & ~(FALLOC_FL_KEEP_SIZE | test_mode)) != 0) return (-EOPNOTSUPP); if (offset < 0 || len <= 0) @@ -756,7 +761,7 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len) crhold(cr); cookie = spl_fstrans_mark(); - if (mode & FALLOC_FL_PUNCH_HOLE) { + if (mode & (test_mode)) { flock64_t bf; if (offset > olen) |