From d60962856c839289cee9eb470aeca2e0626c8db8 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Fri, 24 Feb 2017 15:09:16 -0800 Subject: fscrypt: catch fscrypto_get_policy in v4.10-rc6 Signed-off-by: Jaegeuk Kim --- include/linux/fscrypto.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include/linux/fscrypto.h') diff --git a/include/linux/fscrypto.h b/include/linux/fscrypto.h index 770e5a537..fd0bf5fb2 100644 --- a/include/linux/fscrypto.h +++ b/include/linux/fscrypto.h @@ -273,9 +273,8 @@ extern void fscrypt_restore_control_page(struct page *); extern int fscrypt_zeroout_range(struct inode *, pgoff_t, sector_t, unsigned int); /* policy.c */ -extern int fscrypt_process_policy(struct file *, - const struct fscrypt_policy *); -extern int fscrypt_get_policy(struct inode *, struct fscrypt_policy *); +extern int fscrypt_ioctl_set_policy(struct file *, const void __user *); +extern int fscrypt_ioctl_get_policy(struct file *, void __user *); extern int fscrypt_has_permitted_context(struct inode *, struct inode *); extern int fscrypt_inherit_context(struct inode *, struct inode *, void *, bool); @@ -344,14 +343,14 @@ static inline int fscrypt_notsupp_zeroout_range(struct inode *i, pgoff_t p, } /* policy.c */ -static inline int fscrypt_notsupp_process_policy(struct file *f, - const struct fscrypt_policy *p) +static inline int fscrypt_notsupp_ioctl_set_policy(struct file *f, + const void __user *arg) { return -EOPNOTSUPP; } -static inline int fscrypt_notsupp_get_policy(struct inode *i, - struct fscrypt_policy *p) +static inline int fscrypt_notsupp_ioctl_get_policy(struct file *f, + void __user *arg) { return -EOPNOTSUPP; } -- cgit v1.2.3