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

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

fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers 



fscrypt_has_encryption_key() 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 88406d1e

include/linux/fscrypt.h

+0 −10
Original line number Diff line number Diff line
@@ -129,11 +129,6 @@ static inline struct page *fscrypt_control_page(struct page *page) 
	return ((struct fscrypt_ctx *)page_private(page))->w.control_page;

}



static inline bool fscrypt_has_encryption_key(const struct inode *inode)

{

	return (inode->i_crypt_info != NULL);

}



#include <linux/fscrypt_supp.h>



#else /* !__FS_HAS_ENCRYPTION */
@@ -144,11 +139,6 @@ static inline struct page *fscrypt_control_page(struct page *page) 
	return ERR_PTR(-EINVAL);

}



static inline bool fscrypt_has_encryption_key(const struct inode *inode)

{

	return 0;

}



#include <linux/fscrypt_notsupp.h>

#endif /* __FS_HAS_ENCRYPTION */

include/linux/fscrypt_notsupp.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 
#ifndef _LINUX_FSCRYPT_NOTSUPP_H

#define _LINUX_FSCRYPT_NOTSUPP_H



static inline bool fscrypt_has_encryption_key(const struct inode *inode)

{

	return false;

}



/* crypto.c */

static inline struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode,

						  gfp_t gfp_flags)

include/linux/fscrypt_supp.h

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
#ifndef _LINUX_FSCRYPT_SUPP_H

#define _LINUX_FSCRYPT_SUPP_H



static inline bool fscrypt_has_encryption_key(const struct inode *inode)

{

	return (inode->i_crypt_info != NULL);

}



/* crypto.c */

extern struct kmem_cache *fscrypt_info_cachep;

extern struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *, gfp_t);