ext4: rename htree_inline_dir_to_tree() to ext4_inlinedir_to_tree()

Clean up namespace pollution by the inline_data code.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 83128bdd7abb192dc1cb2288cf223ed8f5e15952..bf660aa7a9e08a54cc6325b6593003702baf3f58 100644 (file)
--- 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 796137bb7dfa047606b571bb25a407c0b4df8830..88cdf3c90bd15873fe1a2334b446822c73226658 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1324,11 +1324,11 @@ out:
  * 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 183ad614ae3d564d1f125bbd67b206a1880b3d5c..c9568fee9e11e1f9abdb137fe3b20060ae78a69f 100644 (file)
--- 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;