Commit 7633b08b authored by Theodore Ts'o's avatar Theodore Ts'o

ext4: rename htree_inline_dir_to_tree() to ext4_inlinedir_to_tree()

Clean up namespace pollution by the inline_data code.
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent ddce3b94
...@@ -3104,11 +3104,11 @@ extern int ext4_try_create_inline_dir(handle_t *handle, ...@@ -3104,11 +3104,11 @@ extern int ext4_try_create_inline_dir(handle_t *handle,
extern int ext4_read_inline_dir(struct file *filp, extern int ext4_read_inline_dir(struct file *filp,
struct dir_context *ctx, struct dir_context *ctx,
int *has_inline_data); int *has_inline_data);
extern int htree_inlinedir_to_tree(struct file *dir_file, extern int ext4_inlinedir_to_tree(struct file *dir_file,
struct inode *dir, ext4_lblk_t block, struct inode *dir, ext4_lblk_t block,
struct dx_hash_info *hinfo, struct dx_hash_info *hinfo,
__u32 start_hash, __u32 start_minor_hash, __u32 start_hash, __u32 start_minor_hash,
int *has_inline_data); int *has_inline_data);
extern struct buffer_head *ext4_find_inline_entry(struct inode *dir, extern struct buffer_head *ext4_find_inline_entry(struct inode *dir,
struct ext4_filename *fname, struct ext4_filename *fname,
struct ext4_dir_entry_2 **res_dir, struct ext4_dir_entry_2 **res_dir,
......
...@@ -1324,11 +1324,11 @@ int ext4_try_add_inline_entry(handle_t *handle, struct ext4_filename *fname, ...@@ -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 * inlined dir. It returns the number directory entries loaded
* into the tree. If there is an error it is returned in err. * into the tree. If there is an error it is returned in err.
*/ */
int htree_inlinedir_to_tree(struct file *dir_file, int ext4_inlinedir_to_tree(struct file *dir_file,
struct inode *dir, ext4_lblk_t block, struct inode *dir, ext4_lblk_t block,
struct dx_hash_info *hinfo, struct dx_hash_info *hinfo,
__u32 start_hash, __u32 start_minor_hash, __u32 start_hash, __u32 start_minor_hash,
int *has_inline_data) int *has_inline_data)
{ {
int err = 0, count = 0; int err = 0, count = 0;
unsigned int parent_ino; unsigned int parent_ino;
......
...@@ -1104,10 +1104,10 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, ...@@ -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; hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
if (ext4_has_inline_data(dir)) { if (ext4_has_inline_data(dir)) {
int has_inline_data = 1; int has_inline_data = 1;
count = htree_inlinedir_to_tree(dir_file, dir, 0, count = ext4_inlinedir_to_tree(dir_file, dir, 0,
&hinfo, start_hash, &hinfo, start_hash,
start_minor_hash, start_minor_hash,
&has_inline_data); &has_inline_data);
if (has_inline_data) { if (has_inline_data) {
*next_hash = ~0; *next_hash = ~0;
return count; return count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment