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

Commit c73c350a authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: move fscrypt_control_page() to supp/notsupp headers 



fscrypt_control_page() is already split into two versions depending on
whether the filesystem is being built with encryption support or not.
Move them into the appropriate headers.

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

include/linux/fscrypt.h

+2 −16
Original line number Diff line number Diff line
@@ -123,24 +123,10 @@ static inline bool fscrypt_is_dot_dotdot(const struct qstr *str) 
}



#if __FS_HAS_ENCRYPTION



static inline struct page *fscrypt_control_page(struct page *page)

{

	return ((struct fscrypt_ctx *)page_private(page))->w.control_page;

}



#include <linux/fscrypt_supp.h>



#else /* !__FS_HAS_ENCRYPTION */



static inline struct page *fscrypt_control_page(struct page *page)

{

	WARN_ON_ONCE(1);

	return ERR_PTR(-EINVAL);

}



#else

#include <linux/fscrypt_notsupp.h>

#endif /* __FS_HAS_ENCRYPTION */

#endif



/**

 * fscrypt_require_key - require an inode's encryption key

include/linux/fscrypt_notsupp.h

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ static inline int fscrypt_decrypt_page(const struct inode *inode, 
	return -EOPNOTSUPP;

}



static inline struct page *fscrypt_control_page(struct page *page)

{

	WARN_ON_ONCE(1);

	return ERR_PTR(-EINVAL);

}



static inline void fscrypt_restore_control_page(struct page *page)

{

include/linux/fscrypt_supp.h

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ extern struct page *fscrypt_encrypt_page(const struct inode *, struct page *, 
						u64, gfp_t);

extern int fscrypt_decrypt_page(const struct inode *, struct page *, unsigned int,

				unsigned int, u64);



static inline struct page *fscrypt_control_page(struct page *page)

{

	return ((struct fscrypt_ctx *)page_private(page))->w.control_page;

}



extern void fscrypt_restore_control_page(struct page *);



extern const struct dentry_operations fscrypt_d_ops;