From e131b06892781d58a37100a55255aaa0d60d2540 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 23 Oct 2020 10:05:00 -0700 Subject: [PATCH] ANDROID: adjust 5.10 fscrypt merge resolution Remove a redundant declaration and adjust a comment in order to get android-mainline in sync with how this merge resolution was done in android12-5.4 (http://aosp/1469924). Fixes: 9d77f49849d3 ("Merge 6f5032a852f9 ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline") Change-Id: Ib005bec74f0fb7e7f6aaf2ba03fa293b6bfb6835 Signed-off-by: Eric Biggers --- include/linux/fscrypt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 60287126bb0f..5895f564bd2d 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -139,7 +139,6 @@ static inline struct page *fscrypt_pagecache_page(struct page *bounce_page) } void fscrypt_free_bounce_page(struct page *bounce_page); -int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags); /* policy.c */ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg); @@ -775,7 +774,7 @@ static inline int fscrypt_prepare_rename(struct inode *old_dir, * directory's encryption key is available, then the lookup is assumed to be by * plaintext name; otherwise, it is assumed to be by no-key name. * - * After calling this function, a filesystem should ensure that it's dentry + * After calling this function, a filesystem should ensure that its dentry * operations contain fscrypt_d_revalidate if DCACHE_NOKEY_NAME was set, * so that the dentry can be invalidated if the key is later added. *