summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-01-25 15:17:01 -0800
committerMichael Bestas <mkbestas@lineageos.org>2019-12-23 23:43:37 +0200
commit461e608fedcb9c117ac72546cc1503c80be80cad (patch)
tree1a672f5dca5be9d99e103d12e1257d21a3422f55
parent62f5709a837fed07174b0ffa2f174ab42f599876 (diff)
security: pfk: fix build when ecryptfs is disabled
To avoid compile errors and warnings when the pfk module is enabled without ecryptfs, the ecryptfs stubs need to be static inline. Bug: 34712722 Change-Id: I39d715fcac1ff2f7781230cc2d1da2a8d803e974 Signed-off-by: Eric Biggers <ebiggers@google.com>
-rw-r--r--include/linux/ecryptfs.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/ecryptfs.h b/include/linux/ecryptfs.h
index 489b99e37128..0f0b66491940 100644
--- a/include/linux/ecryptfs.h
+++ b/include/linux/ecryptfs.h
@@ -158,7 +158,7 @@ static inline int ecryptfs_register_to_events(
return 1; /* dummy handle */
}
-static int ecryptfs_unregister_from_events(int user_handle)
+static inline int ecryptfs_unregister_from_events(int user_handle)
{
return 0;
}
@@ -189,13 +189,14 @@ static inline bool ecryptfs_cipher_match(const void *ecrytpfs_data,
return false;
}
-bool ecryptfs_is_page_in_metadata(const void *ecrytpfs_data, pgoff_t offset)
+static inline bool ecryptfs_is_page_in_metadata(const void *ecrytpfs_data,
+ pgoff_t offset)
{
return false;
}
-bool ecryptfs_is_data_equal(const void *ecrytpfs_data1,
- const void *ecrytpfs_data2)
+static inline bool ecryptfs_is_data_equal(const void *ecrytpfs_data1,
+ const void *ecrytpfs_data2)
{
return false;
}