1 removes static definition of dx_root struct. so that "." and ".." dirent can
2 have extra data. This patch does not change any functionality but is required for
3 ext4_data_in_dirent patch.
5 Index: linux-3.10.0-123.9.3.el7.x86_64/fs/ext4/namei.c
6 ===================================================================
7 --- linux-3.10.0-123.9.3.el7.x86_64.orig/fs/ext4/namei.c
8 +++ linux-3.10.0-123.9.3.el7.x86_64/fs/ext4/namei.c
9 @@ -193,22 +193,13 @@ struct dx_entry
10 * hash version mod 4 should never be 0. Sincerely, the paranoia department.
16 - struct fake_dirent dot;
18 - struct fake_dirent dotdot;
19 - char dotdot_name[4];
22 - __le32 reserved_zero;
24 - u8 info_length; /* 8 */
29 - struct dx_entry entries[0];
30 + __le32 reserved_zero;
32 + u8 info_length; /* 8 */
38 @@ -511,6 +502,16 @@ ext4_next_entry(struct ext4_dir_entry_2
39 * Future: use high four bits of block for coalesce-on-delete flags
40 * Mask them off for now.
42 +struct dx_root_info * dx_get_dx_info(struct ext4_dir_entry_2 *de)
44 + /* get dotdot first */
45 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
47 + /* dx root info is after dotdot entry */
48 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
50 + return (struct dx_root_info *) de;
53 static inline ext4_lblk_t dx_get_block(struct dx_entry *entry)
55 @@ -673,7 +674,7 @@ dx_probe(const struct qstr *d_name, stru
57 unsigned count, indirect;
58 struct dx_entry *at, *entries, *p, *q, *m;
59 - struct dx_root *root;
60 + struct dx_root_info * info;
61 struct buffer_head *bh;
62 struct dx_frame *frame = frame_in;
64 @@ -684,17 +685,18 @@ dx_probe(const struct qstr *d_name, stru
68 - root = (struct dx_root *) bh->b_data;
69 - if (root->info.hash_version != DX_HASH_TEA &&
70 - root->info.hash_version != DX_HASH_HALF_MD4 &&
71 - root->info.hash_version != DX_HASH_LEGACY) {
73 + info = dx_get_dx_info((struct ext4_dir_entry_2*)bh->b_data);
74 + if (info->hash_version != DX_HASH_TEA &&
75 + info->hash_version != DX_HASH_HALF_MD4 &&
76 + info->hash_version != DX_HASH_LEGACY) {
77 ext4_warning(dir->i_sb, "Unrecognised inode hash code %d for directory "
78 - "#%lu", root->info.hash_version, dir->i_ino);
79 + "#%lu", info->hash_version, dir->i_ino);
81 *err = ERR_BAD_DX_DIR;
84 - hinfo->hash_version = root->info.hash_version;
85 + hinfo->hash_version = info->hash_version;
86 if (hinfo->hash_version <= DX_HASH_TEA)
87 hinfo->hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned;
88 hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed;
89 @@ -702,27 +704,26 @@ dx_probe(const struct qstr *d_name, stru
90 ext4fs_dirhash(d_name->name, d_name->len, hinfo);
93 - if (root->info.unused_flags & 1) {
94 + if (info->unused_flags & 1) {
95 ext4_warning(dir->i_sb, "Unimplemented inode hash flags: %#06x",
96 - root->info.unused_flags);
97 + info->unused_flags);
99 *err = ERR_BAD_DX_DIR;
103 - if ((indirect = root->info.indirect_levels) > 1) {
104 + if ((indirect = info->indirect_levels) > 1) {
105 ext4_warning(dir->i_sb, "Unimplemented inode hash depth: %#06x",
106 - root->info.indirect_levels);
107 + info->indirect_levels);
109 *err = ERR_BAD_DX_DIR;
113 - entries = (struct dx_entry *) (((char *)&root->info) +
114 - root->info.info_length);
115 + entries = (struct dx_entry *) (((char *)info) + info->info_length);
117 if (dx_get_limit(entries) != dx_root_limit(dir,
118 - root->info.info_length)) {
119 + info->info_length)) {
120 ext4_warning(dir->i_sb, "dx entry: limit != root limit");
122 *err = ERR_BAD_DX_DIR;
123 @@ -807,10 +808,12 @@ fail:
125 static void dx_release (struct dx_frame *frames)
127 + struct dx_root_info *info;
128 if (frames[0].bh == NULL)
131 - if (((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels)
132 + info = dx_get_dx_info((struct ext4_dir_entry_2*)frames[0].bh->b_data);
133 + if (info->indirect_levels)
134 brelse(frames[1].bh);
135 brelse(frames[0].bh);
137 @@ -1787,10 +1790,9 @@ static int make_indexed_dir(handle_t *ha
138 const char *name = dentry->d_name.name;
139 int namelen = dentry->d_name.len;
140 struct buffer_head *bh2;
141 - struct dx_root *root;
142 struct dx_frame frames[2], *frame;
143 struct dx_entry *entries;
144 - struct ext4_dir_entry_2 *de, *de2;
145 + struct ext4_dir_entry_2 *de, *de2, *dot_de, *dotdot_de;
146 struct ext4_dir_entry_tail *t;
149 @@ -1798,7 +1800,7 @@ static int make_indexed_dir(handle_t *ha
151 struct dx_hash_info hinfo;
153 - struct fake_dirent *fde;
154 + struct dx_root_info *dx_info;
157 if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
158 @@ -1813,18 +1815,19 @@ static int make_indexed_dir(handle_t *ha
162 - root = (struct dx_root *) bh->b_data;
164 + dot_de = (struct ext4_dir_entry_2 *) bh->b_data;
165 + dotdot_de = ext4_next_entry(dot_de, blocksize);
167 /* The 0th block becomes the root, move the dirents out */
168 - fde = &root->dotdot;
169 - de = (struct ext4_dir_entry_2 *)((char *)fde +
170 - ext4_rec_len_from_disk(fde->rec_len, blocksize));
171 - if ((char *) de >= (((char *) root) + blocksize)) {
172 + de = (struct ext4_dir_entry_2 *)((char *)dotdot_de +
173 + ext4_rec_len_from_disk(dotdot_de->rec_len, blocksize));
174 + if ((char *) de >= (((char *) dot_de) + blocksize)) {
175 EXT4_ERROR_INODE(dir, "invalid rec_len for '..'");
179 - len = ((char *) root) + (blocksize - csum_size) - (char *) de;
180 + len = ((char *) dot_de) + (blocksize - csum_size) - (char *) de;
182 /* Allocate new block for the 0th block's dirents */
183 bh2 = ext4_append(handle, dir, &block);
184 @@ -1850,19 +1853,23 @@ static int make_indexed_dir(handle_t *ha
187 /* Initialize the root; the dot dirents already exist */
188 - de = (struct ext4_dir_entry_2 *) (&root->dotdot);
189 - de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2),
191 - memset (&root->info, 0, sizeof(root->info));
192 - root->info.info_length = sizeof(root->info);
193 - root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version;
194 - entries = root->entries;
195 + dotdot_de->rec_len = ext4_rec_len_to_disk(blocksize -
196 + le16_to_cpu(dot_de->rec_len), blocksize);
198 + /* initialize hashing info */
199 + dx_info = dx_get_dx_info(dot_de);
200 + memset (dx_info, 0, sizeof(*dx_info));
201 + dx_info->info_length = sizeof(*dx_info);
202 + dx_info->hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version;
204 + entries = (void *)dx_info + sizeof(*dx_info);
206 dx_set_block(entries, 1);
207 dx_set_count(entries, 1);
208 - dx_set_limit(entries, dx_root_limit(dir, sizeof(root->info)));
209 + dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
211 /* Initialize as for dx_probe */
212 - hinfo.hash_version = root->info.hash_version;
213 + hinfo.hash_version = dx_info->hash_version;
214 if (hinfo.hash_version <= DX_HASH_TEA)
215 hinfo.hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned;
216 hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;
217 @@ -2152,6 +2159,7 @@ static int ext4_dx_add_entry(handle_t *h
221 + struct dx_root_info * info;
222 dxtrace(printk(KERN_DEBUG
223 "Creating second level index...\n"));
224 memcpy((char *) entries2, (char *) entries,
225 @@ -2161,7 +2169,9 @@ static int ext4_dx_add_entry(handle_t *h
227 dx_set_count(entries, 1);
228 dx_set_block(entries + 0, newblock);
229 - ((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels = 1;
230 + info = dx_get_dx_info((struct ext4_dir_entry_2*)
231 + frames[0].bh->b_data);
232 + info->indirect_levels = 1;
234 /* Add new access path frame */