| Message ID | 20200923010151.69506-3-drosen@google.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add support for Encryption and Casefolding in F2FS | expand |
On Wed, Sep 23, 2020 at 01:01:48AM +0000, Daniel Rosenberg wrote: > This is in preparation for shifting the responsibility of setting the > dentry_operations to the filesystem, allowing it to maintain its own > operations. > > Signed-off-by: Daniel Rosenberg <drosen@google.com> > --- > fs/crypto/fname.c | 3 ++- > include/linux/fscrypt.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c > index 011830f84d8d..d45db23ff6c4 100644 > --- a/fs/crypto/fname.c > +++ b/fs/crypto/fname.c > @@ -541,7 +541,7 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash); > * Validate dentries in encrypted directories to make sure we aren't potentially > * caching stale dentries after a key has been added. > */ > -static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) > +int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) > { > struct dentry *dir; > int err; > @@ -580,6 +580,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) > > return valid; > } > +EXPORT_SYMBOL_GPL(fscrypt_d_revalidate); > > const struct dentry_operations fscrypt_d_ops = { > .d_revalidate = fscrypt_d_revalidate, > diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h > index 991ff8575d0e..265b1e9119dc 100644 > --- a/include/linux/fscrypt.h > +++ b/include/linux/fscrypt.h > @@ -207,6 +207,7 @@ int fscrypt_fname_disk_to_usr(const struct inode *inode, > bool fscrypt_match_name(const struct fscrypt_name *fname, > const u8 *de_name, u32 de_name_len); > u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name); > +extern int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags); Please don't use 'extern' here. Also FYI, Jeff Layton has sent this same patch as part of the ceph support for fscrypt: https://lkml.kernel.org/linux-fscrypt/20200914191707.380444-4-jlayton@kernel.org I'd like to apply one of them for 5.10 to get it out of the way for both patchsets, but I'd like for the commit message to mention both users. - Eric
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 011830f84d8d..d45db23ff6c4 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -541,7 +541,7 @@ EXPORT_SYMBOL_GPL(fscrypt_fname_siphash); * Validate dentries in encrypted directories to make sure we aren't potentially * caching stale dentries after a key has been added. */ -static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) +int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) { struct dentry *dir; int err; @@ -580,6 +580,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) return valid; } +EXPORT_SYMBOL_GPL(fscrypt_d_revalidate); const struct dentry_operations fscrypt_d_ops = { .d_revalidate = fscrypt_d_revalidate, diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 991ff8575d0e..265b1e9119dc 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -207,6 +207,7 @@ int fscrypt_fname_disk_to_usr(const struct inode *inode, bool fscrypt_match_name(const struct fscrypt_name *fname, const u8 *de_name, u32 de_name_len); u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name); +extern int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags); /* bio.c */ void fscrypt_decrypt_bio(struct bio *bio);
This is in preparation for shifting the responsibility of setting the dentry_operations to the filesystem, allowing it to maintain its own operations. Signed-off-by: Daniel Rosenberg <drosen@google.com> --- fs/crypto/fname.c | 3 ++- include/linux/fscrypt.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)