Skip to content

Commit d452610

Browse files
robnlundman
authored andcommitted
vdev_file: unify FreeBSD and Linux implementations (openzfs#17046)
Kernel & userspace specifics are in zfs_file_os.c, so there's no particular reason these have to be separate. The one platform-specific part is in the Linux kernel part, to offload flushes to a taskq if we're already inside a filesystem transaction. This would be normally be an unsatisfying wart, but I'm intending to remove this shortly, so I'm content to leave it gated for the moment. Reviewed-by: Allan Jude <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <[email protected]>
1 parent 50294a5 commit d452610

File tree

5 files changed

+31
-377
lines changed

5 files changed

+31
-377
lines changed

lib/libzpool/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ nodist_libzpool_la_SOURCES = \
4646
module/lua/lvm.c \
4747
module/lua/lzio.c \
4848
\
49-
module/os/linux/zfs/vdev_file.c \
5049
module/os/linux/zfs/zio_crypt.c \
5150
\
5251
module/zcommon/cityhash.c \
@@ -143,6 +142,7 @@ nodist_libzpool_la_SOURCES = \
143142
module/zfs/vdev.c \
144143
module/zfs/vdev_draid.c \
145144
module/zfs/vdev_draid_rand.c \
145+
module/zfs/vdev_file.c \
146146
module/zfs/vdev_indirect.c \
147147
module/zfs/vdev_indirect_births.c \
148148
module/zfs/vdev_indirect_mapping.c \

module/Kbuild.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ ZFS_OBJS := \
386386
vdev.o \
387387
vdev_draid.o \
388388
vdev_draid_rand.o \
389+
vdev_file.o \
389390
vdev_indirect.o \
390391
vdev_indirect_births.o \
391392
vdev_indirect_mapping.o \
@@ -447,7 +448,6 @@ ZFS_OBJS_OS := \
447448
spa_misc_os.o \
448449
trace.o \
449450
vdev_disk.o \
450-
vdev_file.o \
451451
vdev_raidz.o \
452452
vdev_label_os.o \
453453
zfs_acl.o \

module/Makefile.bsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ SRCS+= abd_os.c \
200200
kmod_core.c \
201201
spa_os.c \
202202
sysctl_os.c \
203-
vdev_file.c \
204203
vdev_geom.c \
205204
vdev_label_os.c \
206205
zfs_acl.c \
@@ -314,6 +313,7 @@ SRCS+= abd.c \
314313
vdev.c \
315314
vdev_draid.c \
316315
vdev_draid_rand.c \
316+
vdev_file.c \
317317
vdev_indirect_births.c \
318318
vdev_indirect.c \
319319
vdev_indirect_mapping.c \

module/os/freebsd/zfs/vdev_file.c

Lines changed: 0 additions & 342 deletions
This file was deleted.

0 commit comments

Comments
 (0)