c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-02-06 07:13:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

zfs_file: rename zfs_file_fallocate to zfs_file_deallocate

Browse Source 
We only use it on a specific way: to punch a hole in (make sparse) a
region of a file, in order to implement TRIM-like behaviour.

So, call the op "deallocate", and move the Linux-style mode flags down
into the Linux implementation, since they're an implementation detail.

FreeBSD gets a no-op stub (for the moment).

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16496
This commit is contained in:
Rob Norris 2024-09-01 12:31:56 +10:00 committed by Tony Hutter
parent 2e646b5e5a
commit f1694496aa
6 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zfs_file.h
View File

@ -53,7 +53,7 @@ int zfs_file_pread(zfs_file_t *fp, void *buf, size_t len, loff_t off,
int zfs_file_seek(zfs_file_t *fp, loff_t *offp, int whence); int zfs_file_seek(zfs_file_t *fp, loff_t *offp, int whence);
int zfs_file_getattr(zfs_file_t *fp, zfs_file_attr_t *zfattr); int zfs_file_getattr(zfs_file_t *fp, zfs_file_attr_t *zfattr);
int zfs_file_fsync(zfs_file_t *fp, int flags); int 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); int zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len);
loff_t zfs_file_off(zfs_file_t *fp); loff_t zfs_file_off(zfs_file_t *fp);
int zfs_file_unlink(const char *); int zfs_file_unlink(const char *);

24
lib/libzpool/kernel.c
View File

@ -1364,24 +1364,26 @@ zfs_file_fsync(zfs_file_t *fp, int flags)
} }
/* /*
* fallocate - allocate or free space on disk * deallocate - zero and/or deallocate file storage
* *
* fp - file pointer * fp - file pointer
* mode (non-standard options for hole punching etc) * offset - offset to start zeroing or deallocating
* offset - offset to start allocating or freeing from * len - length to zero or deallocate
* len - length to free / allocate
*
* OPTIONAL
*/ */
int int
zfs_file_fallocate(zfs_file_t *fp, int mode, loff_t offset, loff_t len) zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len)
{ {
#ifdef __linux__ int rc;
return (fallocate(fp->f_fd, mode, offset, len)); #if defined(__linux__)
rc = fallocate(fp->f_fd,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, len);
#else #else
(void) fp, (void) mode, (void) offset, (void) len; (void) fp, (void) offset, (void) len;
return (EOPNOTSUPP); rc = EOPNOTSUPP;
#endif #endif
if (rc)
return (SET_ERROR(rc));
return (0);
} }
/* /*

11
module/os/freebsd/zfs/vdev_file.c
View File

@ -267,16 +267,9 @@ vdev_file_io_start(zio_t *zio)
zio_execute(zio); zio_execute(zio);
return; return;
} else if (zio->io_type == ZIO_TYPE_TRIM) { } else if (zio->io_type == ZIO_TYPE_TRIM) {
#ifdef notyet
int mode = 0;
ASSERT3U(zio->io_size, !=, 0); ASSERT3U(zio->io_size, !=, 0);
zio->io_error = zfs_file_deallocate(vf->vf_file,
/* XXX FreeBSD has no fallocate routine in file ops */ zio->io_offset, zio->io_size);
zio->io_error = zfs_file_fallocate(vf->vf_file,
mode, zio->io_offset, zio->io_size);
#endif
zio->io_error = SET_ERROR(ENOTSUP);
zio_execute(zio); zio_execute(zio);
return; return;
} }

14
module/os/freebsd/zfs/zfs_file_os.c
View File

@ -288,6 +288,20 @@ zfs_file_fsync(zfs_file_t *fp, int flags)
return (zfs_vop_fsync(fp->f_vnode)); return (zfs_vop_fsync(fp->f_vnode));
} }
/*
* deallocate - zero and/or deallocate file storage
*
* fp - file pointer
* offset - offset to start zeroing or deallocating
* len - length to zero or deallocate
*/
int
zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len)
{
(void) fp, (void) offset, (void) len;
return (SET_ERROR(EOPNOTSUPP));
}
zfs_file_t * zfs_file_t *
zfs_file_get(int fd) zfs_file_get(int fd)
{ {

9
module/os/linux/zfs/vdev_file.c
View File

@ -280,14 +280,9 @@ vdev_file_io_start(zio_t *zio)
zio_execute(zio); zio_execute(zio);
return; return;
} else if (zio->io_type == ZIO_TYPE_TRIM) { } else if (zio->io_type == ZIO_TYPE_TRIM) {
int mode = 0;
ASSERT3U(zio->io_size, !=, 0); ASSERT3U(zio->io_size, !=, 0);
#ifdef __linux__ zio->io_error = zfs_file_deallocate(vf->vf_file,
mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; zio->io_offset, zio->io_size);
#endif
zio->io_error = zfs_file_fallocate(vf->vf_file,
mode, zio->io_offset, zio->io_size);
zio_execute(zio); zio_execute(zio);
return; return;
} }

19
module/os/linux/zfs/zfs_file_os.c
View File

@ -281,17 +281,14 @@ zfs_file_fsync(zfs_file_t *filp, int flags)
} }
/* /*
* fallocate - allocate or free space on disk * deallocate - zero and/or deallocate file storage
* *
* fp - file pointer * fp - file pointer
* mode (non-standard options for hole punching etc) * offset - offset to start zeroing or deallocating
* offset - offset to start allocating or freeing from * len - length to zero or deallocate
* len - length to free / allocate
*
* OPTIONAL
*/ */
int int
zfs_file_fallocate(zfs_file_t *fp, int mode, loff_t offset, loff_t len) zfs_file_deallocate(zfs_file_t *fp, loff_t offset, loff_t len)
{ {
/* /*
* May enter XFS which generates a warning when PF_FSTRANS is set. * May enter XFS which generates a warning when PF_FSTRANS is set.
@ -307,12 +304,16 @@ zfs_file_fallocate(zfs_file_t *fp, int mode, loff_t offset, loff_t len)
*/ */
int error = EOPNOTSUPP; int error = EOPNOTSUPP;
if (fp->f_op->fallocate) if (fp->f_op->fallocate)
error = fp->f_op->fallocate(fp, mode, offset, len); error = -fp->f_op->fallocate(fp,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, len);
if (fstrans) if (fstrans)
current->flags |= __SPL_PF_FSTRANS; current->flags |= __SPL_PF_FSTRANS;
return (error); if (error)
return (SET_ERROR(error));
return (0);
} }
/* /*