Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f73a1ef7 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

fscrypt: resolve some cherry-pick bugs 



- remove wrong linux/fscrypt.h declared in ext4
- remove obsolete function

Fixes: 734f0d241d2b ("fscrypt: clean up include file mess")
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b9dad2c0

fs/ext4/ext4.h

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ 
#include <linux/compat.h>

#endif



#define __FS_HAS_ENCRYPTION IS_ENABLED(CONFIG_EXT4_FS_ENCRYPTION)

#include <linux/fscrypt.h>



/*

 * The fourth extended filesystem constants/structures

 */

include/linux/fscrypt.h

+0 −11
Original line number Diff line number Diff line
@@ -49,17 +49,6 @@ struct fscrypt_symlink_data { 
	char encrypted_path[1];

} __packed;



/**

 * This function is used to calculate the disk space required to

 * store a filename of length l in encrypted symlink format.

 */

static inline u32 fscrypt_symlink_data_len(u32 l)

{

	if (l < FS_CRYPTO_BLOCK_SIZE)

		l = FS_CRYPTO_BLOCK_SIZE;

	return (l + sizeof(struct fscrypt_symlink_data) - 1);

}



struct fscrypt_str {

	unsigned char *name;

	u32 len;