On Fri, 2020-08-21 at 17:39 -0700, Eric Biggers wrote: > On Fri, Aug 21, 2020 at 02:28:05PM -0400, Jeff Layton wrote: > > Boilerplate ioctls for controlling encryption. > > > > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> > > --- > > fs/ceph/ioctl.c | 26 ++++++++++++++++++++++++++ > > 1 file changed, 26 insertions(+) > > > > diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c > > index 6e061bf62ad4..4400b170eca9 100644 > > --- a/fs/ceph/ioctl.c > > +++ b/fs/ceph/ioctl.c > > @@ -6,6 +6,7 @@ > > #include "mds_client.h" > > #include "ioctl.h" > > #include <linux/ceph/striper.h> > > +#include <linux/fscrypt.h> > > > > /* > > * ioctls > > @@ -289,6 +290,31 @@ long ceph_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > > > > case CEPH_IOC_SYNCIO: > > return ceph_ioctl_syncio(file); > > +#ifdef CONFIG_FS_ENCRYPTION > > + case FS_IOC_SET_ENCRYPTION_POLICY: > > + return fscrypt_ioctl_set_policy(file, (const void __user *)arg); > > + > > + case FS_IOC_GET_ENCRYPTION_POLICY: > > + return fscrypt_ioctl_get_policy(file, (void __user *)arg); > > + > > + case FS_IOC_GET_ENCRYPTION_POLICY_EX: > > + return fscrypt_ioctl_get_policy_ex(file, (void __user *)arg); > > + > > + case FS_IOC_ADD_ENCRYPTION_KEY: > > + return fscrypt_ioctl_add_key(file, (void __user *)arg); > > + > > + case FS_IOC_REMOVE_ENCRYPTION_KEY: > > + return fscrypt_ioctl_remove_key(file, (void __user *)arg); > > + > > + case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS: > > + return fscrypt_ioctl_remove_key_all_users(file, (void __user *)arg); > > + > > + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: > > + return fscrypt_ioctl_get_key_status(file, (void __user *)arg); > > + > > + case FS_IOC_GET_ENCRYPTION_NONCE: > > + return fscrypt_ioctl_get_nonce(file, (void __user *)arg); > > +#endif /* CONFIG_FS_ENCRYPTION */ > > } > > The '#ifdef CONFIG_FS_ENCRYPTION' isn't needed here, since all the > fscrypt_ioctl_*() functions are stubbed out when !CONFIG_FS_ENCRYPTION. > > - Eric Ahh, thanks. Will fix. -- Jeff Layton <jlayton@xxxxxxxxxx>
