[3/3] ext4: rename htree_inline_dir_to_tree() to ext4_inlinedir_to_tree()
diff mbox series

Message ID 20190702212925.29989-3-tytso@mit.edu
State New
Headers show
Series
  • [1/3] ext4: rename "dirent_csum" functions to use "dirblock"
Related show

Commit Message

Theodore Ts'o July 2, 2019, 9:29 p.m. UTC
Clean up namespace pollution by the inline_data code.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 fs/ext4/ext4.h   | 10 +++++-----
 fs/ext4/inline.c | 10 +++++-----
 fs/ext4/namei.c  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

Comments

Darrick J. Wong July 3, 2019, 3:50 a.m. UTC | #1
On Tue, Jul 02, 2019 at 05:29:25PM -0400, Theodore Ts'o wrote:
> Clean up namespace pollution by the inline_data code.
> 
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/ext4/ext4.h   | 10 +++++-----
>  fs/ext4/inline.c | 10 +++++-----
>  fs/ext4/namei.c  |  8 ++++----
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 83128bdd7abb..bf660aa7a9e0 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -3104,11 +3104,11 @@ extern int ext4_try_create_inline_dir(handle_t *handle,
>  extern int ext4_read_inline_dir(struct file *filp,
>  				struct dir_context *ctx,
>  				int *has_inline_data);
> -extern int htree_inlinedir_to_tree(struct file *dir_file,
> -				   struct inode *dir, ext4_lblk_t block,
> -				   struct dx_hash_info *hinfo,
> -				   __u32 start_hash, __u32 start_minor_hash,
> -				   int *has_inline_data);
> +extern int ext4_inlinedir_to_tree(struct file *dir_file,
> +				  struct inode *dir, ext4_lblk_t block,
> +				  struct dx_hash_info *hinfo,
> +				  __u32 start_hash, __u32 start_minor_hash,
> +				  int *has_inline_data);
>  extern struct buffer_head *ext4_find_inline_entry(struct inode *dir,
>  					struct ext4_filename *fname,
>  					struct ext4_dir_entry_2 **res_dir,
> diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
> index 796137bb7dfa..88cdf3c90bd1 100644
> --- a/fs/ext4/inline.c
> +++ b/fs/ext4/inline.c
> @@ -1324,11 +1324,11 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
>   * inlined dir.  It returns the number directory entries loaded
>   * into the tree.  If there is an error it is returned in err.
>   */
> -int htree_inlinedir_to_tree(struct file *dir_file,
> -			    struct inode *dir, ext4_lblk_t block,
> -			    struct dx_hash_info *hinfo,
> -			    __u32 start_hash, __u32 start_minor_hash,
> -			    int *has_inline_data)
> +int ext4_inlinedir_to_tree(struct file *dir_file,
> +			   struct inode *dir, ext4_lblk_t block,
> +			   struct dx_hash_info *hinfo,
> +			   __u32 start_hash, __u32 start_minor_hash,
> +			   int *has_inline_data)
>  {
>  	int err = 0, count = 0;
>  	unsigned int parent_ino;
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 183ad614ae3d..c9568fee9e11 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -1104,10 +1104,10 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
>  		hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
>  		if (ext4_has_inline_data(dir)) {
>  			int has_inline_data = 1;
> -			count = htree_inlinedir_to_tree(dir_file, dir, 0,
> -							&hinfo, start_hash,
> -							start_minor_hash,
> -							&has_inline_data);
> +			count = ext4_inlinedir_to_tree(dir_file, dir, 0,
> +						       &hinfo, start_hash,
> +						       start_minor_hash,
> +						       &has_inline_data);
>  			if (has_inline_data) {
>  				*next_hash = ~0;
>  				return count;
> -- 
> 2.22.0
>

Patch
diff mbox series

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 83128bdd7abb..bf660aa7a9e0 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -3104,11 +3104,11 @@  extern int ext4_try_create_inline_dir(handle_t *handle,
 extern int ext4_read_inline_dir(struct file *filp,
 				struct dir_context *ctx,
 				int *has_inline_data);
-extern int htree_inlinedir_to_tree(struct file *dir_file,
-				   struct inode *dir, ext4_lblk_t block,
-				   struct dx_hash_info *hinfo,
-				   __u32 start_hash, __u32 start_minor_hash,
-				   int *has_inline_data);
+extern int ext4_inlinedir_to_tree(struct file *dir_file,
+				  struct inode *dir, ext4_lblk_t block,
+				  struct dx_hash_info *hinfo,
+				  __u32 start_hash, __u32 start_minor_hash,
+				  int *has_inline_data);
 extern struct buffer_head *ext4_find_inline_entry(struct inode *dir,
 					struct ext4_filename *fname,
 					struct ext4_dir_entry_2 **res_dir,
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 796137bb7dfa..88cdf3c90bd1 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1324,11 +1324,11 @@  int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname,
  * inlined dir.  It returns the number directory entries loaded
  * into the tree.  If there is an error it is returned in err.
  */
-int htree_inlinedir_to_tree(struct file *dir_file,
-			    struct inode *dir, ext4_lblk_t block,
-			    struct dx_hash_info *hinfo,
-			    __u32 start_hash, __u32 start_minor_hash,
-			    int *has_inline_data)
+int ext4_inlinedir_to_tree(struct file *dir_file,
+			   struct inode *dir, ext4_lblk_t block,
+			   struct dx_hash_info *hinfo,
+			   __u32 start_hash, __u32 start_minor_hash,
+			   int *has_inline_data)
 {
 	int err = 0, count = 0;
 	unsigned int parent_ino;
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 183ad614ae3d..c9568fee9e11 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1104,10 +1104,10 @@  int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
 		hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
 		if (ext4_has_inline_data(dir)) {
 			int has_inline_data = 1;
-			count = htree_inlinedir_to_tree(dir_file, dir, 0,
-							&hinfo, start_hash,
-							start_minor_hash,
-							&has_inline_data);
+			count = ext4_inlinedir_to_tree(dir_file, dir, 0,
+						       &hinfo, start_hash,
+						       start_minor_hash,
+						       &has_inline_data);
 			if (has_inline_data) {
 				*next_hash = ~0;
 				return count;