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/5.2.17-1+rpi1^2~64
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1dcfc6c6aaa23a8f4eea47937921f178808b7939;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 0645ec428b4..153e30c2238 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2466,3 +2466,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 6f753198eee..5eaec5dddba 100644
--- a/fs/crypto/crypto.c
+++ b/fs/crypto/crypto.c
@@ -501,3 +501,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 4079605d437..7947da6c004 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -6160,6 +6160,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 4b47ac994da..960d0e3ecf8 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3685,4 +3685,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 e0382067c82..9aa8ba3d577 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2731,6 +2731,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 62c58cfeb8d..bbe45048f9e 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1343,5 +1343,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)