Skip to content

Commit

Permalink
zfs: fix commit dae1713 merge openzfs/zfs@269b5dadc into main
Browse files Browse the repository at this point in the history
Commit dae1713 did not add two required lines for edonr specific
functionality to this file, causing kernel build failures if ZFS is
compiled in.

This commit should be included in an eventual MFC of dae1713.
  • Loading branch information
stesser committed Nov 17, 2021
1 parent dae1713 commit 09cd634
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions sys/conf/files
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,9 @@ contrib/openzfs/module/zcommon/zfs_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zcommon/zpool_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zcommon/zprop_common.c optional zfs compile-with "${ZFS_C}"

# zfs edon-r hash support
contrib/openzfs/module/icp/algs/edonr/edonr.c optional zfs compile-with "${ZFS_C}"

#zfs core common code
contrib/openzfs/module/zfs/abd.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/aggsum.c optional zfs compile-with "${ZFS_C}"
Expand Down Expand Up @@ -283,6 +286,7 @@ contrib/openzfs/module/zfs/dsl_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_scan.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_synctask.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_userhold.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/edonr_zfs.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/fm.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/gzip.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/lzjb.c optional zfs compile-with "${ZFS_C}"
Expand Down

0 comments on commit 09cd634

Please sign in to comment.