fscrypt: remove fscrypt_inherit_context()

Now that all filesystems have been converted to use
fscrypt_prepare_new_inode() and fscrypt_set_context(),
fscrypt_inherit_context() is no longer used.  Remove it.

Acked-by: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/r/20200917041136.178600-8-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 7e96953d385ec2aef2b0a2629f154590d73ccb7e..4ff893f7b030a8d4aad879401a5524bf0dbec320 100644 (file)
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -628,43 +628,6 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)
 }
 EXPORT_SYMBOL(fscrypt_has_permitted_context);
 
-/**
- * fscrypt_inherit_context() - Sets a child context from its parent
- * @parent: Parent inode from which the context is inherited.
- * @child:  Child inode that inherits the context from @parent.
- * @fs_data:  private data given by FS.
- * @preload:  preload child i_crypt_info if true
- *
- * Return: 0 on success, -errno on failure
- */
-int fscrypt_inherit_context(struct inode *parent, struct inode *child,
-                                               void *fs_data, bool preload)
-{
-       u8 nonce[FSCRYPT_FILE_NONCE_SIZE];
-       union fscrypt_context ctx;
-       int ctxsize;
-       struct fscrypt_info *ci;
-       int res;
-
-       res = fscrypt_get_encryption_info(parent);
-       if (res < 0)
-               return res;
-
-       ci = fscrypt_get_info(parent);
-       if (ci == NULL)
-               return -ENOKEY;
-
-       get_random_bytes(nonce, FSCRYPT_FILE_NONCE_SIZE);
-       ctxsize = fscrypt_new_context(&ctx, &ci->ci_policy, nonce);
-
-       BUILD_BUG_ON(sizeof(ctx) != FSCRYPT_SET_CONTEXT_MAX_SIZE);
-       res = parent->i_sb->s_cop->set_context(child, &ctx, ctxsize, fs_data);
-       if (res)
-               return res;
-       return preload ? fscrypt_get_encryption_info(child): 0;
-}
-EXPORT_SYMBOL(fscrypt_inherit_context);
-
 /**
  * fscrypt_set_context() - Set the fscrypt context of a new inode
  * @inode: a new inode

diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 9cf7ca90f3abbb51837adebe8a373bf3145ef672..81d6ded2432888f9da9be8daff6032eb3d059588 100644 (file)
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -156,8 +156,6 @@ int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg);
 int fscrypt_ioctl_get_policy_ex(struct file *filp, void __user *arg);
 int fscrypt_ioctl_get_nonce(struct file *filp, void __user *arg);
 int fscrypt_has_permitted_context(struct inode *parent, struct inode *child);
-int fscrypt_inherit_context(struct inode *parent, struct inode *child,
-                           void *fs_data, bool preload);
 int fscrypt_set_context(struct inode *inode, void *fs_data);
 
 struct fscrypt_dummy_context {
@@ -343,13 +341,6 @@ static inline int fscrypt_has_permitted_context(struct inode *parent,
        return 0;
 }
 
-static inline int fscrypt_inherit_context(struct inode *parent,
-                                         struct inode *child,
-                                         void *fs_data, bool preload)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int fscrypt_set_context(struct inode *inode, void *fs_data)
 {
        return -EOPNOTSUPP;