From 4f45f5aa3eb6dd55aadad14913326d8fa1f5e7e5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 13 Apr 2016 21:48:06 +0100
Subject: [PATCH] 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
---
 fs/btrfs/super.c  | 2 +-
 fs/ext4/super.c   | 2 +-
 fs/f2fs/super.c   | 2 +-
 fs/jbd2/journal.c | 1 +
 fs/nfsd/nfsctl.c  | 3 +++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index ea731fa8bd3..fb9d2ed116c 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2620,7 +2620,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 02236f298de..3e07f80f54f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -6823,6 +6823,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 9fed42e7bb1..45b2f599210 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4217,5 +4217,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: crc32");
+MODULE_SOFTDEP("pre: crypto-crc32");
 
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 205e6c7c2fd..b2944dc5ea8 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -3030,6 +3030,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 2feaa49fb9f..79c9eb65f35 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1563,5 +1563,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)
-- 
2.30.2