c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure 64-bit off_t is used in user space instead of loff_t

Browse Source 
Use 64-bit POSIX off_t in user space instead of the Linux kernel type
loff_t. This is enforced at configure time via AC_SYS_LARGEFILE and
AC_CHECK_SIZEOF([off_t]). loff_t remains in shared headers where they
mirror Linux VFS interfaces, and on FreeBSD we typedef loff_t to off_t
in those headers since libc does not provide it.

Reviewed-by: Rob Norris <robn@despairlabs.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Alexander Moch <mail@alexmoch.com>
Closes #18020
This commit is contained in:
Alexander Moch
2025-12-10 17:45:39 +00:00
committed by GitHub
parent 48842c0a41
commit ff47dd35e2
9 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/cmd/clone_mmap_cached.c
+4 -3
View File
@@ -36,12 +36,13 @@
#include <string.h>
#include <unistd.h>
#ifdef __FreeBSD__
#define loff_t off_t
#if defined(_GNU_SOURCE) && defined(__linux__)
_Static_assert(sizeof (loff_t) == sizeof (off_t),
"loff_t and off_t must be the same size");
#endif
ssize_t
copy_file_range(int, loff_t *, int, loff_t *, size_t, unsigned int)
copy_file_range(int, off_t *, int, off_t *, size_t, unsigned int)
__attribute__((weak));
static void *
tests/zfs-tests/cmd/clone_mmap_write.c
+4 -3
View File
@@ -42,12 +42,13 @@
#include <sys/stat.h>
#include <sys/mman.h>
#ifdef __FreeBSD__
#define loff_t off_t
#if defined(_GNU_SOURCE) && defined(__linux__)
_Static_assert(sizeof (loff_t) == sizeof (off_t),
"loff_t and off_t must be the same size");
#endif
ssize_t
copy_file_range(int, loff_t *, int, loff_t *, size_t, unsigned int)
copy_file_range(int, off_t *, int, off_t *, size_t, unsigned int)
__attribute__((weak));
static int
tests/zfs-tests/cmd/clonefile.c
+12 -11
View File
@@ -59,16 +59,17 @@
#endif
#endif /* __NR_copy_file_range */
#ifdef __FreeBSD__
#define loff_t off_t
#if defined(_GNU_SOURCE) && defined(__linux__)
_Static_assert(sizeof (loff_t) == sizeof (off_t),
"loff_t and off_t must be the same size");
#endif
ssize_t
copy_file_range(int, loff_t *, int, loff_t *, size_t, unsigned int)
copy_file_range(int, off_t *, int, off_t *, size_t, unsigned int)
__attribute__((weak));
static inline ssize_t
cf_copy_file_range(int sfd, loff_t *soff, int dfd, loff_t *doff,
cf_copy_file_range(int sfd, off_t *soff, int dfd, off_t *doff,
size_t len, unsigned int flags)
{
if (copy_file_range)
@@ -151,9 +152,9 @@ usage(void)
}
int do_clone(int sfd, int dfd);
int do_clonerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len);
int do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len);
int do_deduperange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len);
int do_clonerange(int sfd, int dfd, off_t soff, off_t doff, size_t len);
int do_copyfilerange(int sfd, int dfd, off_t soff, off_t doff, size_t len);
int do_deduperange(int sfd, int dfd, off_t soff, off_t doff, size_t len);
int quiet = 0;
@@ -203,7 +204,7 @@ main(int argc, char **argv)
abort();
}
loff_t soff = 0, doff = 0;
off_t soff = 0, doff = 0;
size_t len = SSIZE_MAX;
unsigned long long len2;
if ((argc-optind) == 5) {
@@ -295,7 +296,7 @@ do_clone(int sfd, int dfd)
}
int
do_clonerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len)
do_clonerange(int sfd, int dfd, off_t soff, off_t doff, size_t len)
{
if (!quiet)
fprintf(stderr, "using FICLONERANGE\n");
@@ -314,7 +315,7 @@ do_clonerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len)
}
int
do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len)
do_copyfilerange(int sfd, int dfd, off_t soff, off_t doff, size_t len)
{
if (!quiet)
fprintf(stderr, "using copy_file_range\n");
@@ -341,7 +342,7 @@ do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len)
}
int
do_deduperange(int sfd, int dfd, loff_t soff, loff_t doff, size_t len)
do_deduperange(int sfd, int dfd, off_t soff, off_t doff, size_t len)
{
if (!quiet)
fprintf(stderr, "using FIDEDUPERANGE\n");