Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vdev_file: unify FreeBSD and Linux implementations #17046

Merged
merged 1 commit into from
Feb 20, 2025
+31 −377
Merged

vdev_file: unify FreeBSD and Linux implementations #17046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/libzpool/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ nodist_libzpool_la_SOURCES = \
module/lua/lvm.c \
module/lua/lzio.c \
\
module/os/linux/zfs/vdev_file.c \
module/os/linux/zfs/zio_crypt.c \
\
module/zcommon/cityhash.c \
Expand Down Expand Up @@ -143,6 +142,7 @@ nodist_libzpool_la_SOURCES = \
module/zfs/vdev.c \
module/zfs/vdev_draid.c \
module/zfs/vdev_draid_rand.c \
module/zfs/vdev_file.c \
module/zfs/vdev_indirect.c \
module/zfs/vdev_indirect_births.c \
module/zfs/vdev_indirect_mapping.c \
Expand Down
2 changes: 1 addition & 1 deletion module/Kbuild.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ ZFS_OBJS := \
vdev.o \
vdev_draid.o \
vdev_draid_rand.o \
vdev_file.o \
vdev_indirect.o \
vdev_indirect_births.o \
vdev_indirect_mapping.o \
Expand Down Expand Up @@ -446,7 +447,6 @@ ZFS_OBJS_OS := \
spa_misc_os.o \
trace.o \
vdev_disk.o \
vdev_file.o \
vdev_raidz.o \
vdev_label_os.o \
zfs_acl.o \
Expand Down
2 changes: 1 addition & 1 deletion module/Makefile.bsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ SRCS+= abd_os.c \
kmod_core.c \
spa_os.c \
sysctl_os.c \
vdev_file.c \
vdev_geom.c \
vdev_label_os.c \
zfs_acl.c \
Expand Down Expand Up @@ -313,6 +312,7 @@ SRCS+= abd.c \
vdev.c \
vdev_draid.c \
vdev_draid_rand.c \
vdev_file.c \
vdev_indirect_births.c \
vdev_indirect.c \
vdev_indirect_mapping.c \
Expand Down
342 changes: 0 additions & 342 deletions module/os/freebsd/zfs/vdev_file.c
View file
Open in desktop

This file was deleted.

Loading
Loading