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

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

fs/ext4/ext4.h

+5 −5
Original line number Diff line number Diff line
@@ -3104,7 +3104,7 @@ 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,

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,

fs/ext4/inline.c

+5 −5
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ 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,

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,

fs/ext4/namei.c

+4 −4
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ 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,

			count = ext4_inlinedir_to_tree(dir_file, dir, 0,

						       &hinfo, start_hash,

						       start_minor_hash,

						       &has_inline_data);