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

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

fscrypt: clean up after fscrypt_prepare_lookup() conversions 



Now that all filesystems have been converted to use
fscrypt_prepare_lookup(), we can remove the fscrypt_set_d_op() and
fscrypt_set_encrypted_dentry() functions as well as un-export
fscrypt_d_ops.

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

fs/crypto/crypto.c

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) 
const struct dentry_operations fscrypt_d_ops = {

	.d_revalidate = fscrypt_d_revalidate,

};

EXPORT_SYMBOL(fscrypt_d_ops);



void fscrypt_restore_control_page(struct page *page)

{

fs/crypto/fscrypt_private.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ extern int fscrypt_do_page_crypto(const struct inode *inode, 
				  gfp_t gfp_flags);

extern struct page *fscrypt_alloc_bounce_page(struct fscrypt_ctx *ctx,

					      gfp_t gfp_flags);

extern const struct dentry_operations fscrypt_d_ops;



/* fname.c */

extern int fname_encrypt(struct inode *inode, const struct qstr *iname,

include/linux/fscrypt_notsupp.h

+0 −10
Original line number Diff line number Diff line
@@ -67,16 +67,6 @@ static inline void fscrypt_restore_control_page(struct page *page) 
	return;

}



static inline void fscrypt_set_d_op(struct dentry *dentry)

{

	return;

}



static inline void fscrypt_set_encrypted_dentry(struct dentry *dentry)

{

	return;

}



/* policy.c */

static inline int fscrypt_ioctl_set_policy(struct file *filp,

					   const void __user *arg)

include/linux/fscrypt_supp.h

+0 −14
Original line number Diff line number Diff line
@@ -74,20 +74,6 @@ static inline struct page *fscrypt_control_page(struct page *page) 


extern void fscrypt_restore_control_page(struct page *);



extern const struct dentry_operations fscrypt_d_ops;



static inline void fscrypt_set_d_op(struct dentry *dentry)

{

	d_set_d_op(dentry, &fscrypt_d_ops);

}



static inline void fscrypt_set_encrypted_dentry(struct dentry *dentry)

{

	spin_lock(&dentry->d_lock);

	dentry->d_flags |= DCACHE_ENCRYPTED_WITH_KEY;

	spin_unlock(&dentry->d_lock);

}



/* policy.c */

extern int fscrypt_ioctl_set_policy(struct file *, const void __user *);

extern int fscrypt_ioctl_get_policy(struct file *, void __user *);