From e49fde3f5636de7a83a83bea09e93da9deecc4d6 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 14 Apr 2016 00:34:51 +0100
Subject: [PATCH] fs: Add '#include <linux/module.h>' where necessary in the
 crypto softdep patch

---
 ...ftdep-declarations-for-hard-coded-cr.patch | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
index 45c20aefd..29151d177 100644
--- a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
+++ b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
@@ -23,7 +23,15 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 
 --- a/fs/btrfs/hash.c
 +++ b/fs/btrfs/hash.c
-@@ -44,3 +44,5 @@ u32 btrfs_crc32c(u32 crc, const void *ad
+@@ -13,6 +13,7 @@
+ 
+ #include <crypto/hash.h>
+ #include <linux/err.h>
++#include <linux/module.h>
+ #include "hash.h"
+ 
+ static struct crypto_shash *tfm;
+@@ -44,3 +45,5 @@ u32 btrfs_crc32c(u32 crc, const void *ad
  
  	return *ctx;
  }
@@ -63,7 +71,15 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +MODULE_SOFTDEP("pre: crypto-des crypto-ecb crypto-md4");
 --- a/fs/ext4/crypto_key.c
 +++ b/fs/ext4/crypto_key.c
-@@ -274,3 +274,5 @@ int ext4_has_encryption_key(struct inode
+@@ -10,6 +10,7 @@
+ 
+ #include <keys/encrypted-type.h>
+ #include <keys/user-type.h>
++#include <linux/module.h>
+ #include <linux/random.h>
+ #include <linux/scatterlist.h>
+ #include <uapi/linux/keyctl.h>
+@@ -274,3 +275,5 @@ int ext4_has_encryption_key(struct inode
  
  	return (ei->i_crypt_info != NULL);
  }
@@ -82,7 +98,15 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  MODULE_LICENSE("GPL");
 --- a/fs/f2fs/crypto_key.c
 +++ b/fs/f2fs/crypto_key.c
-@@ -252,3 +252,5 @@ int f2fs_has_encryption_key(struct inode
+@@ -11,6 +11,7 @@
+  */
+ #include <keys/encrypted-type.h>
+ #include <keys/user-type.h>
++#include <linux/module.h>
+ #include <linux/random.h>
+ #include <linux/scatterlist.h>
+ #include <uapi/linux/keyctl.h>
+@@ -252,3 +253,5 @@ int f2fs_has_encryption_key(struct inode
  
  	return (fi->i_crypt_info != NULL);
  }