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

Commit 46f47e48 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

fscrypt: split supp and notsupp declarations into their own headers 



Previously, each filesystem configured without encryption support would
define all the public fscrypt functions to their notsupp_* stubs.  This
list of #defines had to be updated in every filesystem whenever a change
was made to the public fscrypt functions.  To make things more
maintainable now that we have three filesystems using fscrypt, split the
old header fscrypto.h into several new headers.  fscrypt_supp.h contains
the real declarations and is included by filesystems when configured
with encryption support, whereas fscrypt_notsupp.h contains the inline
stubs and is included by filesystems when configured without encryption
support.  fscrypt_common.h contains common declarations needed by both.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 02680b31

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5268,7 +5268,7 @@ M: Jaegeuk Kim <jaegeuk@kernel.org> 
L:	linux-fsdevel@vger.kernel.org

S:	Supported

F:	fs/crypto/

F:	include/linux/fscrypto.h

F:	include/linux/fscrypt*.h



F2FS FILE SYSTEM

M:	Jaegeuk Kim <jaegeuk@kernel.org>

fs/crypto/fscrypt_private.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _FSCRYPT_PRIVATE_H

#define _FSCRYPT_PRIVATE_H



#include <linux/fscrypto.h>

#include <linux/fscrypt_supp.h>



#define FS_FNAME_CRYPTO_DIGEST_SIZE	32

fs/ext4/ext4.h

+5 −23
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ 
#include <linux/percpu_counter.h>

#include <linux/ratelimit.h>

#include <crypto/hash.h>

#include <linux/fscrypto.h>

#ifdef CONFIG_EXT4_FS_ENCRYPTION

#include <linux/fscrypt_supp.h>

#else

#include <linux/fscrypt_notsupp.h>

#endif

#include <linux/falloc.h>

#include <linux/percpu-rwsem.h>

#ifdef __KERNEL__
@@ -2309,28 +2313,6 @@ static inline int ext4_fname_setup_filename(struct inode *dir, 
}

static inline void ext4_fname_free_filename(struct ext4_filename *fname) { }



#define fscrypt_set_d_op(i)

#define fscrypt_get_ctx			fscrypt_notsupp_get_ctx

#define fscrypt_release_ctx		fscrypt_notsupp_release_ctx

#define fscrypt_encrypt_page		fscrypt_notsupp_encrypt_page

#define fscrypt_decrypt_page		fscrypt_notsupp_decrypt_page

#define fscrypt_decrypt_bio_pages	fscrypt_notsupp_decrypt_bio_pages

#define fscrypt_pullback_bio_page	fscrypt_notsupp_pullback_bio_page

#define fscrypt_restore_control_page	fscrypt_notsupp_restore_control_page

#define fscrypt_zeroout_range		fscrypt_notsupp_zeroout_range

#define fscrypt_ioctl_set_policy	fscrypt_notsupp_ioctl_set_policy

#define fscrypt_ioctl_get_policy	fscrypt_notsupp_ioctl_get_policy

#define fscrypt_has_permitted_context	fscrypt_notsupp_has_permitted_context

#define fscrypt_inherit_context		fscrypt_notsupp_inherit_context

#define fscrypt_get_encryption_info	fscrypt_notsupp_get_encryption_info

#define fscrypt_put_encryption_info	fscrypt_notsupp_put_encryption_info

#define fscrypt_setup_filename		fscrypt_notsupp_setup_filename

#define fscrypt_free_filename		fscrypt_notsupp_free_filename

#define fscrypt_fname_encrypted_size	fscrypt_notsupp_fname_encrypted_size

#define fscrypt_fname_alloc_buffer	fscrypt_notsupp_fname_alloc_buffer

#define fscrypt_fname_free_buffer	fscrypt_notsupp_fname_free_buffer

#define fscrypt_fname_disk_to_usr	fscrypt_notsupp_fname_disk_to_usr

#define fscrypt_fname_usr_to_disk	fscrypt_notsupp_fname_usr_to_disk

#endif



/* dir.c */

fs/ext4/page-io.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/backing-dev.h>

#include <linux/fscrypto.h>



#include "ext4_jbd2.h"

#include "xattr.h"

fs/f2fs/f2fs.h

+5 −25
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ 
#include <linux/vmalloc.h>

#include <linux/bio.h>

#include <linux/blkdev.h>

#include <linux/fscrypto.h>

#ifdef CONFIG_F2FS_FS_ENCRYPTION

#include <linux/fscrypt_supp.h>

#else

#include <linux/fscrypt_notsupp.h>

#endif

#include <crypto/hash.h>



#ifdef CONFIG_F2FS_CHECK_FS
@@ -2501,28 +2505,4 @@ static inline bool f2fs_may_encrypt(struct inode *inode) 
#endif

}



#ifndef CONFIG_F2FS_FS_ENCRYPTION

#define fscrypt_set_d_op(i)

#define fscrypt_get_ctx			fscrypt_notsupp_get_ctx

#define fscrypt_release_ctx		fscrypt_notsupp_release_ctx

#define fscrypt_encrypt_page		fscrypt_notsupp_encrypt_page

#define fscrypt_decrypt_page		fscrypt_notsupp_decrypt_page

#define fscrypt_decrypt_bio_pages	fscrypt_notsupp_decrypt_bio_pages

#define fscrypt_pullback_bio_page	fscrypt_notsupp_pullback_bio_page

#define fscrypt_restore_control_page	fscrypt_notsupp_restore_control_page

#define fscrypt_zeroout_range		fscrypt_notsupp_zeroout_range

#define fscrypt_ioctl_set_policy	fscrypt_notsupp_ioctl_set_policy

#define fscrypt_ioctl_get_policy	fscrypt_notsupp_ioctl_get_policy

#define fscrypt_has_permitted_context	fscrypt_notsupp_has_permitted_context

#define fscrypt_inherit_context		fscrypt_notsupp_inherit_context

#define fscrypt_get_encryption_info	fscrypt_notsupp_get_encryption_info

#define fscrypt_put_encryption_info	fscrypt_notsupp_put_encryption_info

#define fscrypt_setup_filename		fscrypt_notsupp_setup_filename

#define fscrypt_free_filename		fscrypt_notsupp_free_filename

#define fscrypt_fname_encrypted_size	fscrypt_notsupp_fname_encrypted_size

#define fscrypt_fname_alloc_buffer	fscrypt_notsupp_fname_alloc_buffer

#define fscrypt_fname_free_buffer	fscrypt_notsupp_fname_free_buffer

#define fscrypt_fname_disk_to_usr	fscrypt_notsupp_fname_disk_to_usr

#define fscrypt_fname_usr_to_disk	fscrypt_notsupp_fname_usr_to_disk

#endif

#endif