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/4.18.10-2+rpi1^2~65
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8fa6bfad7a217fc4e153043ee62f8693bbf5ff7c;p=linux.git

fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers

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 9b25f29d0e7..7ff1010c4c7 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2512,3 +2512,4 @@ late_initcall(init_btrfs_fs);
 module_exit(exit_btrfs_fs)
 
 MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-crc32c");
diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c
index 0f46cf55090..bf08c6e9726 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -499,3 +499,4 @@ static void __exit fscrypt_exit(void)
 module_exit(fscrypt_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_SOFTDEP("pre: crypto-aes crypto-ecb");
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 130c12974e2..91511d2e512 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5985,6 +5985,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 742147cbe75..55932b3be66 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3239,4 +3239,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-crc32c");
 
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 8ef6b6daaa7..ed306d45349 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2722,6 +2722,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 d107b4426f7..53c0dcf84d3 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1334,5 +1334,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)