From 2aedb8ff690f755a76780ecddabe9037f80e92d9 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Tue, 16 Jun 2020 15:13:37 -0700 Subject: [PATCH] fscrypt: remove stale definition Fixes wrong merge resolution only in f2fs-stable. Signed-off-by: Jaegeuk Kim --- include/linux/fscrypt.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index d81beb99ee7b..48c2869fea26 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -224,11 +224,6 @@ int __fscrypt_encrypt_symlink(struct inode *inode, const char *target, const char *fscrypt_get_symlink(struct inode *inode, const void *caddr, unsigned int max_size, struct delayed_call *done); -static inline void fscrypt_set_ops(struct super_block *sb, - const struct fscrypt_operations *s_cop) -{ - sb->s_cop = s_cop; -} #else /* !CONFIG_FS_ENCRYPTION */ static inline bool fscrypt_has_encryption_key(const struct inode *inode)