fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers

Bug-Debian: https://bugs.debian.org/819725
Forwarded: http://mid.gmane.org/20160517133631.GF7555@decadent.org.uk

This helps initramfs builders and other tools to find the full
dependencies of a module.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[Lukas Wunner: Forward-ported to 4.11: drop parts applied upstream]

Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name fs-add-module_softdep-declarations-for-hard-coded-cr.patch

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 25967ecaaf0af97fca8ba95830bdfa5599996706..38de076e7de3e58a2d2b59975ab39a1e979e827c 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2591,7 +2591,7 @@ late_initcall(init_btrfs_fs);
 module_exit(exit_btrfs_fs)
 
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: crc32c");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 MODULE_SOFTDEP("pre: xxhash64");
 MODULE_SOFTDEP("pre: sha256");
 MODULE_SOFTDEP("pre: blake2b-256");

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 20378050df09cd22828023b9fed7fc25650173e4..1f567228bab4a893feec1096840f6dfc8a13d68a 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -6483,6 +6483,6 @@ static void __exit ext4_exit_fs(void)
 MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
 MODULE_DESCRIPTION("Fourth Extended Filesystem");
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: crc32c");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 module_init(ext4_init_fs)
 module_exit(ext4_exit_fs)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index be5050292caa5b64c90ddbc1a08a532119373c0b..0a448ac3c4d15a6dcb8fe91dcae7f66a2334cf76 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4047,4 +4047,5 @@ module_exit(exit_f2fs_fs)
 MODULE_AUTHOR("Samsung Electronics's Praesto Team");
 MODULE_DESCRIPTION("Flash Friendly File System");
 MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32");
 

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 17fdc482f554affb72940291ab33173d482c4c1a..590655be48706bd3484c655da2b5d8ef4f10e653 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2761,6 +2761,7 @@ static void __exit journal_exit(void)
 }
 
 MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32c");
 module_init(journal_init);
 module_exit(journal_exit);
 

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 7ae2361130401e1349203fcc8f78cc3a9b811ab4..3516d1d930619b3cad9ab2bdc61a059d4fd3d061 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1583,5 +1583,8 @@ static void __exit exit_nfsd(void)
 
 MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
 MODULE_LICENSE("GPL");
+#ifdef CONFIG_NFSD_V4
+MODULE_SOFTDEP("pre: crypto-md5");
+#endif
 module_init(init_nfsd)
 module_exit(exit_nfsd)