From 0c9aa07eb897c04e5eeb563bf757745da16a05a4 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Tue, 14 May 2024 12:26:02 +1000 Subject: [PATCH] LU-17423 ldiskfs: pass NULL to ext4_dir_rec_len for dot and dotdot For '.' and '..' we should pass NULL to EXT4_DIR_ENTRY_LEN/ EXT4_DIR_REC_LEN/ext4_dir_rec_len() as those entries do not use extra fields to store the extra hash for casefolded+fscrypt case. This has no impact yet as we do not support casefolded+fscrypt right now. Change-Id: I6df56aefdf6440e4c03088fec7a4d38a523cf8dc Test-Parameters: trivial Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54724 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Artem Blagodarenko Reviewed-by: Shaun Tancheff Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- .../patches/linux-6.0/ext4-data-in-dirent.patch | 108 ++------------------- .../patches/linux-6.0/ext4-pdirop.patch | 6 +- .../patches/rhel9.1/ext4-data-in-dirent.patch | 108 ++------------------- .../patches/rhel9.1/ext4-pdirop.patch | 6 +- .../patches/rhel9.2/ext4-data-in-dirent.patch | 108 ++------------------- .../patches/rhel9.2/ext4-pdirop.patch | 6 +- .../patches/rhel9.3/ext4-data-in-dirent.patch | 108 ++------------------- .../patches/rhel9/ext4-data-in-dirent.patch | 108 ++------------------- .../kernel_patches/patches/rhel9/ext4-pdirop.patch | 6 +- .../patches/sles15sp4/ext4-data-in-dirent.patch | 108 ++------------------- .../patches/sles15sp4/ext4-pdirop.patch | 6 +- .../ubuntu20.04.5/ext4-data-in-dirent.patch | 108 ++------------------- 12 files changed, 64 insertions(+), 722 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/linux-6.0/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/linux-6.0/ext4-data-in-dirent.patch index c6381c8..cc52fb1 100644 --- a/ldiskfs/kernel_patches/patches/linux-6.0/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/linux-6.0/ext4-data-in-dirent.patch @@ -308,7 +308,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 649dc0a..54bbe22 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -290,13 +290,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -290,7 +290,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -318,13 +318,6 @@ index 649dc0a..54bbe22 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -436,22 +437,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -357,21 +350,18 @@ index 649dc0a..54bbe22 100644 if (offset) *offset = count_offset; -@@ -554,13 +556,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -556,11 +558,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -405,15 +395,6 @@ index 649dc0a..54bbe22 100644 names++; } de = ext4_next_entry(de, size); -@@ -821,7 +829,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -877,11 +885,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -432,48 +413,6 @@ index 649dc0a..54bbe22 100644 goto fail; } -@@ -958,7 +969,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -967,7 +978,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1268,12 +1279,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1806,7 +1817,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1930,7 +1941,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -575,15 +514,6 @@ index 649dc0a..54bbe22 100644 /* * XXX shouldn't update any times until successful -@@ -2309,7 +2364,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2320,7 +2375,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -594,13 +524,7 @@ index 649dc0a..54bbe22 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2361,12 +2386,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2366,7 +2391,106 @@ out_frames: return retval; } @@ -626,7 +550,7 @@ index 649dc0a..54bbe22 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -756,24 +680,6 @@ index 649dc0a..54bbe22 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2700,7 +2769,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2726,7 +2795,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -3029,38 +3098,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/linux-6.0/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/linux-6.0/ext4-pdirop.patch index 53499be..354a38a 100644 --- a/ldiskfs/kernel_patches/patches/linux-6.0/ext4-pdirop.patch +++ b/ldiskfs/kernel_patches/patches/linux-6.0/ext4-pdirop.patch @@ -223,7 +223,7 @@ index 54bbe22..9b20bc5 100644 - struct dx_frame *frame); + struct dx_frame *frame, + struct htree_lock *lck); - static void dx_release(struct dx_frame *frames, struct inode *dir); + static void dx_release(struct dx_frame *frames); static int dx_make_map(struct inode *dir, struct buffer_head *bh, struct dx_hash_info *hinfo, @@ -312,12 +324,13 @@ static void dx_insert_block(struct dx_frame *frame, @@ -587,7 +587,7 @@ index 54bbe22..9b20bc5 100644 blocks[level] = block; frame++; frame->bh = ext4_read_dirblock(dir, block, INDEX); -@@ -1009,7 +1319,7 @@ static void dx_release(struct dx_frame *frames, struct inode *dir) +@@ -1009,7 +1319,7 @@ static void dx_release(struct dx_frame *frames) static int ext4_htree_next_block(struct inode *dir, __u32 hash, struct dx_frame *frame, struct dx_frame *frames, @@ -924,7 +924,7 @@ index 54bbe22..9b20bc5 100644 + ext4_htree_dx_unlock(lck); + ext4_htree_de_unlock(lck); brelse(bh); - dx_release(frames, dir); + dx_release(frames); /* @restart is true means htree-path has been changed, we need to diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5a4b03a..8083662 100644 diff --git a/ldiskfs/kernel_patches/patches/rhel9.1/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/rhel9.1/ext4-data-in-dirent.patch index 04ca33b..f21f465 100644 --- a/ldiskfs/kernel_patches/patches/rhel9.1/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/rhel9.1/ext4-data-in-dirent.patch @@ -309,7 +309,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 4d932a2..ee1a058 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -262,13 +262,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -262,7 +262,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -319,13 +319,6 @@ index 4d932a2..ee1a058 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -408,22 +409,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -358,21 +351,18 @@ index 4d932a2..ee1a058 100644 if (offset) *offset = count_offset; -@@ -526,13 +528,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -528,11 +530,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -406,15 +396,6 @@ index 4d932a2..ee1a058 100644 names++; } de = ext4_next_entry(de, size); -@@ -793,7 +801,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -849,11 +857,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -433,48 +414,6 @@ index 4d932a2..ee1a058 100644 goto fail; } -@@ -930,7 +941,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -939,7 +950,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1240,12 +1251,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1778,7 +1789,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1902,7 +1913,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -576,15 +515,6 @@ index 4d932a2..ee1a058 100644 /* * XXX shouldn't update any times until successful -@@ -2273,7 +2327,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2284,7 +2338,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -595,13 +525,7 @@ index 4d932a2..ee1a058 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2348,12 +2373,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2353,7 +2378,106 @@ out_frames: return retval; } @@ -627,7 +551,7 @@ index 4d932a2..ee1a058 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -757,24 +681,6 @@ index 4d932a2..ee1a058 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2664,7 +2732,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2690,7 +2758,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -2993,38 +3061,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/rhel9.1/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/rhel9.1/ext4-pdirop.patch index 3662f8d..24daa55 100644 --- a/ldiskfs/kernel_patches/patches/rhel9.1/ext4-pdirop.patch +++ b/ldiskfs/kernel_patches/patches/rhel9.1/ext4-pdirop.patch @@ -216,7 +216,7 @@ index 2760dc6..2d14bd2 100644 - struct dx_frame *frame); + struct dx_frame *frame, + struct htree_lock *lck); - static void dx_release(struct dx_frame *frames, struct inode *dir); + static void dx_release(struct dx_frame *frames); static int dx_make_map(struct inode *dir, struct buffer_head *bh, struct dx_hash_info *hinfo, @@ -307,12 +319,13 @@ static void dx_insert_block(struct dx_frame *frame, @@ -580,7 +580,7 @@ index 2760dc6..2d14bd2 100644 blocks[level] = block; frame++; frame->bh = ext4_read_dirblock(dir, block, INDEX); -@@ -1004,7 +1314,7 @@ static void dx_release(struct dx_frame *frames, struct inode *dir) +@@ -1004,7 +1314,7 @@ static void dx_release(struct dx_frame *frames) static int ext4_htree_next_block(struct inode *dir, __u32 hash, struct dx_frame *frame, struct dx_frame *frames, @@ -917,7 +917,7 @@ index 2760dc6..2d14bd2 100644 + ext4_htree_dx_unlock(lck); + ext4_htree_de_unlock(lck); brelse(bh); - dx_release(frames, dir); + dx_release(frames); /* @restart is true means htree-path has been changed, we need to diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b271e1f..cda88f8 100644 diff --git a/ldiskfs/kernel_patches/patches/rhel9.2/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/rhel9.2/ext4-data-in-dirent.patch index 5e11425..38a9823 100644 --- a/ldiskfs/kernel_patches/patches/rhel9.2/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/rhel9.2/ext4-data-in-dirent.patch @@ -309,7 +309,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 649dc0a..54bbe22 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -290,13 +290,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -290,7 +290,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -319,13 +319,6 @@ index 649dc0a..54bbe22 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -436,22 +437,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -358,21 +351,18 @@ index 649dc0a..54bbe22 100644 if (offset) *offset = count_offset; -@@ -554,13 +556,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -556,11 +558,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -406,15 +396,6 @@ index 649dc0a..54bbe22 100644 names++; } de = ext4_next_entry(de, size); -@@ -821,7 +829,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -877,11 +885,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -433,48 +414,6 @@ index 649dc0a..54bbe22 100644 goto fail; } -@@ -958,7 +969,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -967,7 +978,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1268,12 +1279,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1806,7 +1817,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1930,7 +1941,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -576,15 +515,6 @@ index 649dc0a..54bbe22 100644 /* * XXX shouldn't update any times until successful -@@ -2309,7 +2364,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2320,7 +2375,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -595,13 +525,7 @@ index 649dc0a..54bbe22 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2362,12 +2387,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2367,7 +2392,106 @@ out_frames: return retval; } @@ -627,7 +551,7 @@ index 649dc0a..54bbe22 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -757,24 +681,6 @@ index 649dc0a..54bbe22 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2700,7 +2769,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2726,7 +2795,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -3029,38 +3098,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/rhel9.2/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/rhel9.2/ext4-pdirop.patch index 53499be..354a38a 100644 --- a/ldiskfs/kernel_patches/patches/rhel9.2/ext4-pdirop.patch +++ b/ldiskfs/kernel_patches/patches/rhel9.2/ext4-pdirop.patch @@ -223,7 +223,7 @@ index 54bbe22..9b20bc5 100644 - struct dx_frame *frame); + struct dx_frame *frame, + struct htree_lock *lck); - static void dx_release(struct dx_frame *frames, struct inode *dir); + static void dx_release(struct dx_frame *frames); static int dx_make_map(struct inode *dir, struct buffer_head *bh, struct dx_hash_info *hinfo, @@ -312,12 +324,13 @@ static void dx_insert_block(struct dx_frame *frame, @@ -587,7 +587,7 @@ index 54bbe22..9b20bc5 100644 blocks[level] = block; frame++; frame->bh = ext4_read_dirblock(dir, block, INDEX); -@@ -1009,7 +1319,7 @@ static void dx_release(struct dx_frame *frames, struct inode *dir) +@@ -1009,7 +1319,7 @@ static void dx_release(struct dx_frame *frames) static int ext4_htree_next_block(struct inode *dir, __u32 hash, struct dx_frame *frame, struct dx_frame *frames, @@ -924,7 +924,7 @@ index 54bbe22..9b20bc5 100644 + ext4_htree_dx_unlock(lck); + ext4_htree_de_unlock(lck); brelse(bh); - dx_release(frames, dir); + dx_release(frames); /* @restart is true means htree-path has been changed, we need to diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5a4b03a..8083662 100644 diff --git a/ldiskfs/kernel_patches/patches/rhel9.3/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/rhel9.3/ext4-data-in-dirent.patch index 3df382c..8a26632 100644 --- a/ldiskfs/kernel_patches/patches/rhel9.3/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/rhel9.3/ext4-data-in-dirent.patch @@ -309,7 +309,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index d0afa8f2..839d51ba 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -291,13 +291,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -291,7 +291,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -319,13 +319,6 @@ index d0afa8f2..839d51ba 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -437,22 +438,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -358,21 +351,18 @@ index d0afa8f2..839d51ba 100644 if (offset) *offset = count_offset; -@@ -555,13 +557,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -557,11 +559,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -406,15 +396,6 @@ index d0afa8f2..839d51ba 100644 names++; } de = ext4_next_entry(de, size); -@@ -822,7 +830,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -878,11 +886,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -433,48 +414,6 @@ index d0afa8f2..839d51ba 100644 goto fail; } -@@ -959,7 +970,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -968,7 +979,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1269,12 +1280,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1806,7 +1817,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1930,7 +1941,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -576,15 +515,6 @@ index d0afa8f2..839d51ba 100644 /* * XXX shouldn't update any times until successful -@@ -2309,7 +2364,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2320,7 +2375,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -595,13 +525,7 @@ index d0afa8f2..839d51ba 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2361,12 +2386,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2366,7 +2391,106 @@ out_frames: return retval; } @@ -627,7 +551,7 @@ index d0afa8f2..839d51ba 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -757,24 +681,6 @@ index d0afa8f2..839d51ba 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2700,7 +2769,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2726,7 +2795,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -3029,38 +3098,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/rhel9/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/rhel9/ext4-data-in-dirent.patch index d2eb65d..081c6db 100644 --- a/ldiskfs/kernel_patches/patches/rhel9/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/rhel9/ext4-data-in-dirent.patch @@ -309,7 +309,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1f95773..9edb487 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -262,13 +262,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -262,7 +262,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -319,13 +319,6 @@ index 1f95773..9edb487 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct ext4_dir_entry_2 *de, - unsigned blocksize, struct dx_hash_info *hinfo, - struct dx_map_entry map[]); @@ -408,22 +409,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -358,21 +351,18 @@ index 1f95773..9edb487 100644 if (offset) *offset = count_offset; -@@ -526,13 +528,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -528,11 +530,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -406,15 +396,6 @@ index 1f95773..9edb487 100644 names++; } de = ext4_next_entry(de, size); -@@ -791,7 +799,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -847,11 +855,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -433,48 +414,6 @@ index 1f95773..9edb487 100644 goto fail; } -@@ -914,7 +925,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -923,7 +934,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1224,12 +1235,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1755,7 +1766,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1879,7 +1890,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -576,15 +515,6 @@ index 1f95773..9edb487 100644 /* * XXX shouldn't update any times until successful -@@ -2246,7 +2300,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2257,7 +2311,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -595,13 +525,7 @@ index 1f95773..9edb487 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2298,12 +2323,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2303,7 +2328,106 @@ out_frames: return retval; } @@ -627,7 +551,7 @@ index 1f95773..9edb487 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -757,24 +681,6 @@ index 1f95773..9edb487 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2637,7 +2705,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2663,7 +2731,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -2966,38 +3034,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/rhel9/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/rhel9/ext4-pdirop.patch index 1a2791f..d0c2792 100644 --- a/ldiskfs/kernel_patches/patches/rhel9/ext4-pdirop.patch +++ b/ldiskfs/kernel_patches/patches/rhel9/ext4-pdirop.patch @@ -200,7 +200,7 @@ index 059bc08..7d25879 100644 - struct dx_frame *frame); + struct dx_frame *frame, + struct htree_lock *lck); - static void dx_release(struct dx_frame *frames, struct inode *dir); + static void dx_release(struct dx_frame *frames); static int dx_make_map(struct inode *dir, struct ext4_dir_entry_2 *de, unsigned blocksize, struct dx_hash_info *hinfo, @@ -284,12 +293,13 @@ static void dx_insert_block(struct dx_frame *frame, @@ -551,7 +551,7 @@ index 059bc08..7d25879 100644 frame++; frame->bh = ext4_read_dirblock(dir, dx_get_block(at), INDEX); if (IS_ERR(frame->bh)) { -@@ -965,7 +1266,7 @@ static void dx_release(struct dx_frame *frames, struct inode *dir) +@@ -965,7 +1266,7 @@ static void dx_release(struct dx_frame *frames) static int ext4_htree_next_block(struct inode *dir, __u32 hash, struct dx_frame *frame, struct dx_frame *frames, @@ -888,7 +888,7 @@ index 059bc08..7d25879 100644 + ext4_htree_dx_unlock(lck); + ext4_htree_de_unlock(lck); brelse(bh); - dx_release(frames, dir); + dx_release(frames); /* @restart is true means htree-path has been changed, we need to diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5751080..a9372ee 100644 diff --git a/ldiskfs/kernel_patches/patches/sles15sp4/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/sles15sp4/ext4-data-in-dirent.patch index 7928ae2..c45344a 100644 --- a/ldiskfs/kernel_patches/patches/sles15sp4/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/sles15sp4/ext4-data-in-dirent.patch @@ -314,7 +314,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 7f00dc3..51c950b 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -285,13 +285,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -285,7 +285,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -324,13 +324,6 @@ index 7f00dc3..51c950b 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -431,22 +432,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -363,21 +356,18 @@ index 7f00dc3..51c950b 100644 if (offset) *offset = count_offset; -@@ -549,13 +551,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -551,11 +553,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -411,15 +401,6 @@ index 7f00dc3..51c950b 100644 names++; } de = ext4_next_entry(de, size); -@@ -816,7 +824,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -872,11 +880,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -438,48 +419,6 @@ index 7f00dc3..51c950b 100644 goto fail; } -@@ -953,7 +964,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -962,7 +973,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1263,12 +1274,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1801,7 +1812,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1925,7 +1936,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -581,15 +520,6 @@ index 7f00dc3..51c950b 100644 /* * XXX shouldn't update any times until successful -@@ -2296,7 +2350,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2307,7 +2361,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -600,13 +530,7 @@ index 7f00dc3..51c950b 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2348,12 +2373,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2353,7 +2378,106 @@ out_frames: return retval; } @@ -632,7 +556,7 @@ index 7f00dc3..51c950b 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -762,24 +686,6 @@ index 7f00dc3..51c950b 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2687,7 +2754,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2713,7 +2780,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -3016,38 +3083,73 @@ err_unlock_inode: return err; } diff --git a/ldiskfs/kernel_patches/patches/sles15sp4/ext4-pdirop.patch b/ldiskfs/kernel_patches/patches/sles15sp4/ext4-pdirop.patch index e12ffce..648e7ff 100644 --- a/ldiskfs/kernel_patches/patches/sles15sp4/ext4-pdirop.patch +++ b/ldiskfs/kernel_patches/patches/sles15sp4/ext4-pdirop.patch @@ -216,7 +216,7 @@ index 51c950b..1b8c80e 100644 - struct dx_frame *frame); + struct dx_frame *frame, + struct htree_lock *lck); - static void dx_release(struct dx_frame *frames, struct inode *dir); + static void dx_release(struct dx_frame *frames); static int dx_make_map(struct inode *dir, struct buffer_head *bh, struct dx_hash_info *hinfo, @@ -307,12 +319,13 @@ static void dx_insert_block(struct dx_frame *frame, @@ -580,7 +580,7 @@ index 51c950b..1b8c80e 100644 blocks[level] = block; frame++; frame->bh = ext4_read_dirblock(dir, block, INDEX); -@@ -1004,7 +1314,7 @@ static void dx_release(struct dx_frame *frames, struct inode *dir) +@@ -1004,7 +1314,7 @@ static void dx_release(struct dx_frame *frames) static int ext4_htree_next_block(struct inode *dir, __u32 hash, struct dx_frame *frame, struct dx_frame *frames, @@ -917,7 +917,7 @@ index 51c950b..1b8c80e 100644 + ext4_htree_dx_unlock(lck); + ext4_htree_de_unlock(lck); brelse(bh); - dx_release(frames, dir); + dx_release(frames); /* @restart is true means htree-path has been changed, we need to diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a2fcbf8..82ea5f6 100644 diff --git a/ldiskfs/kernel_patches/patches/ubuntu20.04.5/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/ubuntu20.04.5/ext4-data-in-dirent.patch index 674e91f..608246e 100644 --- a/ldiskfs/kernel_patches/patches/ubuntu20.04.5/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/ubuntu20.04.5/ext4-data-in-dirent.patch @@ -301,7 +301,7 @@ diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 25e84f0e..5c068e3a 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c -@@ -290,13 +290,14 @@ static unsigned dx_get_count(struct dx_entry *entries); +@@ -290,7 +290,8 @@ static unsigned dx_get_count(struct dx_entry *entries); static unsigned dx_get_limit(struct dx_entry *entries); static void dx_set_count(struct dx_entry *entries, unsigned value); static void dx_set_limit(struct dx_entry *entries, unsigned value); @@ -311,13 +311,6 @@ index 25e84f0e..5c068e3a 100644 static unsigned dx_node_limit(struct inode *dir); static struct dx_frame *dx_probe(struct ext4_filename *fname, struct inode *dir, - struct dx_hash_info *hinfo, - struct dx_frame *frame); --static void dx_release(struct dx_frame *frames); -+static void dx_release(struct dx_frame *frames, struct inode *dir); - static int dx_make_map(struct inode *dir, struct buffer_head *bh, - struct dx_hash_info *hinfo, - struct dx_map_entry *map_tail); @@ -436,22 +437,23 @@ static struct dx_countlimit *get_dx_countlimit(struct inode *inode, { struct ext4_dir_entry *dp; @@ -350,21 +343,18 @@ index 25e84f0e..5c068e3a 100644 if (offset) *offset = count_offset; -@@ -554,13 +556,14 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) - * Future: use high four bits of block for coalesce-on-delete flags - * Mask them off for now. +@@ -556,11 +558,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize) */ --struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) -+struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de, struct inode *i_dir) + struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de) { + BUG_ON(de->name_len != 1); /* get dotdot first */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); /* dx root info is after dotdot entry */ - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2)); -+ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, i_dir)); ++ de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_ENTRY_LEN(de, NULL)); return (struct dx_root_info *)de; } @@ -398,15 +388,6 @@ index 25e84f0e..5c068e3a 100644 names++; } de = ext4_next_entry(de, size); -@@ -823,7 +831,7 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, - if (IS_ERR(frame->bh)) - return (struct dx_frame *) frame->bh; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frame->bh->b_data, dir); - if (info->hash_version != DX_HASH_TEA && - info->hash_version != DX_HASH_HALF_MD4 && - info->hash_version != DX_HASH_LEGACY && @@ -885,11 +893,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir, entries = (struct dx_entry *)(((char *)info) + info->info_length); @@ -425,48 +406,6 @@ index 25e84f0e..5c068e3a 100644 goto fail; } -@@ -966,7 +977,7 @@ fail: - return ret_err; - } - --static void dx_release(struct dx_frame *frames) -+static void dx_release(struct dx_frame *frames, struct inode *dir) - { - struct dx_root_info *info; - int i; -@@ -975,7 +986,7 @@ static void dx_release(struct dx_frame *frames) - if (frames[0].bh == NULL) - return; - -- info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data); -+ info = dx_get_dx_info((struct ext4_dir_entry_2 *)frames[0].bh->b_data, dir); - /* save local copy, "info" may be freed after brelse() */ - indirect_levels = info->indirect_levels; - for (i = 0; i <= indirect_levels; i++) { -@@ -1281,12 +1292,12 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, - (count && ((hashval & 1) == 0))) - break; - } -- dx_release(frames); -+ dx_release(frames, dir); - dxtrace(printk(KERN_DEBUG "Fill tree: returned %d entries, " - "next hash: %x\n", count, *next_hash)); - return count; - errout: -- dx_release(frames); -+ dx_release(frames, dir); - return (err); - } - -@@ -1821,7 +1832,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, - errout: - dxtrace(printk(KERN_DEBUG "%s not found\n", fname->usr_fname->name)); - success: -- dx_release(frames); -+ dx_release(frames, dir); - return bh; - } - @@ -1945,7 +1956,7 @@ dx_move_dirents(struct inode *dir, char *from, char *to, while (count--) { struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) @@ -568,15 +507,6 @@ index 25e84f0e..5c068e3a 100644 /* * XXX shouldn't update any times until successful -@@ -2324,7 +2378,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, - blocksize); - - /* initialize hashing info */ -- dx_info = dx_get_dx_info(dot_de); -+ dx_info = dx_get_dx_info(dot_de, dir); - memset(dx_info, 0, sizeof(*dx_info)); - dx_info->info_length = sizeof(*dx_info); - if (ext4_hash_in_dirent(dir)) @@ -2335,7 +2389,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, entries = (void *)dx_info + sizeof(*dx_info); dx_set_block(entries, 1); @@ -587,13 +517,7 @@ index 25e84f0e..5c068e3a 100644 /* Initialize as for dx_probe */ fname->hinfo.hash_version = dx_info->hash_version; -@@ -2381,12 +2406,111 @@ out_frames: - */ - if (retval) - ext4_mark_inode_dirty(handle, dir); -- dx_release(frames); -+ dx_release(frames, dir); - brelse(bh2); +@@ -2386,7 +2411,106 @@ out_frames: return retval; } @@ -619,7 +543,7 @@ index 25e84f0e..5c068e3a 100644 + len = EXT4_DIR_REC_LEN(2 + dlen, NULL) - + EXT4_DIR_ENTRY_LEN(dotdot_de, NULL); + -+ dx_info = dx_get_dx_info(dot_de, NULL); ++ dx_info = dx_get_dx_info(dot_de); + entries = (struct dx_entry *)((char *)dx_info + + sizeof(*dx_info)); + count = dx_get_count(entries); @@ -749,24 +673,6 @@ index 25e84f0e..5c068e3a 100644 if (ext4_has_metadata_csum(inode->i_sb)) csum_size = sizeof(struct ext4_dir_entry_tail); -@@ -2720,7 +2788,7 @@ again: - dx_set_count(entries, 1); - dx_set_block(entries + 0, newblock); - info = dx_get_dx_info((struct ext4_dir_entry_2 *) -- frames[0].bh->b_data); -+ frames[0].bh->b_data, dir); - info->indirect_levels = 1; - dxtrace(printk(KERN_DEBUG - "Creating %d level index...\n", -@@ -2746,7 +2814,7 @@ journal_error: - ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */ - cleanup: - brelse(bh); -- dx_release(frames); -+ dx_release(frames, dir); - /* @restart is true means htree-path has been changed, we need to - * repeat dx_probe() to find out valid htree-path - */ @@ -3049,38 +3117,73 @@ err_unlock_inode: return err; } -- 1.8.3.1