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

module: weld all but spl.ko into zfs.ko #13274

Closed
wants to merge 6 commits into from
Closed

module: weld all but spl.ko into zfs.ko #13274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5715be6
linux: module: weld all but spl.ko into zfs.ko
nabijaczleweli Mar 31, 2022
242cf5b
linux: module: zfs: list out all authors and licences
nabijaczleweli Apr 1, 2022
990ec70
scripts: zfs.sh: remove cat
nabijaczleweli Apr 4, 2022
5797554
scripts: zfs.sh: make usage make sense
nabijaczleweli Apr 4, 2022
d36ca0c
scripts: zfs.sh: unload zfs with dependencies
nabijaczleweli Apr 4, 2022
adccba5
linux: module: uninstall legacy modules on (un)installation
nabijaczleweli Apr 4, 2022
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 Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ vcscheck:

PHONY += zstdcheck
zstdcheck:
@$(MAKE) -C module/zstd checksymbols
@$(MAKE) -C module check-zstd-symbols

PHONY += lint
lint: cppcheck paxcheck
Expand Down
11 changes: 0 additions & 11 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,6 @@ AC_CONFIG_FILES([
man/Makefile
module/Kbuild
module/Makefile
module/avl/Makefile
module/icp/Makefile
module/lua/Makefile
module/nvpair/Makefile
module/os/linux/spl/Makefile
module/os/linux/zfs/Makefile
module/spl/Makefile
module/unicode/Makefile
module/zcommon/Makefile
module/zfs/Makefile
module/zstd/Makefile
rpm/Makefile
rpm/generic/Makefile
rpm/generic/zfs-dkms.spec
Expand Down
3 changes: 1 addition & 2 deletions etc/init.d/zfs-zed.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ do_stop()
then
# No pools imported, it is/should be safe/possible to
# unload modules.
zfs_action "Unloading modules" rmmod zfs zunicode \
zavl zcommon znvpair zlua spl
zfs_action "Unloading modules" rmmod zfs spl
return "$?"
fi
}
Expand Down
3 changes: 0 additions & 3 deletions include/os/freebsd/spl/sys/ccompile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ extern "C" {
#endif

#define EXPORT_SYMBOL(x)
#define MODULE_AUTHOR(s)
#define MODULE_DESCRIPTION(s)
#define MODULE_LICENSE(s)
#define module_param(a, b, c)
#define module_param_call(a, b, c, d, e)
#define module_param_named(a, b, c, d)
Expand Down
5 changes: 0 additions & 5 deletions include/os/freebsd/spl/sys/mod_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@

#include <sys/sysctl.h>

#define ZFS_MODULE_DESCRIPTION(s)
#define ZFS_MODULE_AUTHOR(s)
#define ZFS_MODULE_LICENSE(s)
#define ZFS_MODULE_VERSION(s)

#define EXPORT_SYMBOL(x)
#define module_param(a, b, c)
#define MODULE_PARM_DESC(a, b)
Expand Down
7 changes: 0 additions & 7 deletions include/os/linux/kernel/linux/mod_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,4 @@ enum scope_prefix_types {

#define ZFS_MODULE_PARAM_ARGS const char *buf, zfs_kernel_param_t *kp

#define ZFS_MODULE_DESCRIPTION(s) MODULE_DESCRIPTION(s)
#define ZFS_MODULE_AUTHOR(s) MODULE_AUTHOR(s)
#define ZFS_MODULE_LICENSE(s) MODULE_LICENSE(s)
#define ZFS_MODULE_VERSION(s) MODULE_VERSION(s)

#define module_init_early(fn) module_init(fn)

#endif /* _MOD_COMPAT_H */
5 changes: 0 additions & 5 deletions include/sys/mod.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
* Exported symbols
*/
#define EXPORT_SYMBOL(x)

#define ZFS_MODULE_DESCRIPTION(s)
#define ZFS_MODULE_AUTHOR(s)
#define ZFS_MODULE_LICENSE(s)
#define ZFS_MODULE_VERSION(s)
#endif

#endif /* SYS_MOD_H */
Loading