diff mbox series

[RESEND] libfs: unexport generic_ci_d_compare() and generic_ci_d_hash()

Message ID 20201228232529.45365-1-ebiggers@kernel.org (mailing list archive)
State New
Headers show
Series [RESEND] libfs: unexport generic_ci_d_compare() and generic_ci_d_hash() | expand

Commit Message

Eric Biggers Dec. 28, 2020, 11:25 p.m. UTC
From: Eric Biggers <ebiggers@google.com>

Now that generic_set_encrypted_ci_d_ops() has been added and ext4 and
f2fs are using it, it's no longer necessary to export
generic_ci_d_compare() and generic_ci_d_hash() to filesystems.

Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/libfs.c         | 8 +++-----
 include/linux/fs.h | 5 -----
 2 files changed, 3 insertions(+), 10 deletions(-)

Comments

Eric Biggers Jan. 12, 2021, 7:14 p.m. UTC | #1
On Mon, Dec 28, 2020 at 03:25:29PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Now that generic_set_encrypted_ci_d_ops() has been added and ext4 and
> f2fs are using it, it's no longer necessary to export
> generic_ci_d_compare() and generic_ci_d_hash() to filesystems.
> 
> Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  fs/libfs.c         | 8 +++-----
>  include/linux/fs.h | 5 -----
>  2 files changed, 3 insertions(+), 10 deletions(-)

Jaegeuk, any interest in applying this given that this code came in through the
f2fs tree in the first place?

- Eric
Jaegeuk Kim Jan. 12, 2021, 10:26 p.m. UTC | #2
On 01/12, Eric Biggers wrote:
> On Mon, Dec 28, 2020 at 03:25:29PM -0800, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> > 
> > Now that generic_set_encrypted_ci_d_ops() has been added and ext4 and
> > f2fs are using it, it's no longer necessary to export
> > generic_ci_d_compare() and generic_ci_d_hash() to filesystems.
> > 
> > Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> >  fs/libfs.c         | 8 +++-----
> >  include/linux/fs.h | 5 -----
> >  2 files changed, 3 insertions(+), 10 deletions(-)
> 
> Jaegeuk, any interest in applying this given that this code came in through the
> f2fs tree in the first place?

Let me merge this. Please let me know if there's any objection.

> 
> - Eric
diff mbox series

Patch

diff --git a/fs/libfs.c b/fs/libfs.c
index d1c3bade9f30d..79721571e014e 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -1388,8 +1388,8 @@  static bool needs_casefold(const struct inode *dir)
  *
  * Return: 0 if names match, 1 if mismatch, or -ERRNO
  */
-int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,
-			  const char *str, const struct qstr *name)
+static int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,
+				const char *str, const struct qstr *name)
 {
 	const struct dentry *parent = READ_ONCE(dentry->d_parent);
 	const struct inode *dir = READ_ONCE(parent->d_inode);
@@ -1426,7 +1426,6 @@  int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,
 		return 1;
 	return !!memcmp(str, name->name, len);
 }
-EXPORT_SYMBOL(generic_ci_d_compare);
 
 /**
  * generic_ci_d_hash - generic d_hash implementation for casefolding filesystems
@@ -1435,7 +1434,7 @@  EXPORT_SYMBOL(generic_ci_d_compare);
  *
  * Return: 0 if hash was successful or unchanged, and -EINVAL on error
  */
-int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)
+static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)
 {
 	const struct inode *dir = READ_ONCE(dentry->d_inode);
 	struct super_block *sb = dentry->d_sb;
@@ -1450,7 +1449,6 @@  int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str)
 		return -EINVAL;
 	return 0;
 }
-EXPORT_SYMBOL(generic_ci_d_hash);
 
 static const struct dentry_operations generic_ci_dentry_ops = {
 	.d_hash = generic_ci_d_hash,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index fd47deea7c176..6d8b1e7337e48 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3192,11 +3192,6 @@  extern int generic_file_fsync(struct file *, loff_t, loff_t, int);
 
 extern int generic_check_addressable(unsigned, u64);
 
-#ifdef CONFIG_UNICODE
-extern int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str);
-extern int generic_ci_d_compare(const struct dentry *dentry, unsigned int len,
-				const char *str, const struct qstr *name);
-#endif
 extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry);
 
 #ifdef CONFIG_MIGRATION