evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

security: pfk: fix build when ecryptfs is disabled

Browse source 
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>
This commit is contained in:
Eric Biggers 2017-01-25 15:17:01 -08:00 • committed by Timi
parent 384480646f
commit 4d8bcbb48b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/linux/ecryptfs.h
View file

@ -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;
}