From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 13 Apr 2016 20:48:06 +0000 (+0100)
Subject: fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers
X-Git-Tag: archive/raspbian/6.12.27-1+rpi1^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=774c2ea4ea845ead4df39f174308a6cc7574cffc;p=linux.git

fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers

Bug-Debian: https://bugs.debian.org/819725
Forwarded: https://lore.kernel.org/all/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 96d67895156..87ad469cfbd 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2617,7 +2617,7 @@ module_exit(exit_btrfs_fs)
 
 MODULE_DESCRIPTION("B-Tree File System (BTRFS)");
 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 4291ab3c20b..76d2884201d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -7471,6 +7471,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/jbd2/journal.c b/fs/jbd2/journal.c
index c073f5fb985..edebe05a385 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -3180,6 +3180,7 @@ static void __exit journal_exit(void)
 
 MODULE_DESCRIPTION("Generic filesystem journal-writing module");
 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 2e835e7c107..cfe9074663b 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -2389,5 +2389,8 @@ static void __exit exit_nfsd(void)
 MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
 MODULE_DESCRIPTION("In-kernel NFS server");
 MODULE_LICENSE("GPL");
+#ifdef CONFIG_NFSD_V4
+MODULE_SOFTDEP("pre: crypto-md5");
+#endif
 module_init(init_nfsd)
 module_exit(exit_nfsd)