1 diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
2 index 1d1bca7..df2a96d 100644
5 @@ -67,11 +67,11 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
6 const int rlen = ext4_rec_len_from_disk(de->rec_len,
7 dir->i_sb->s_blocksize);
9 - if (unlikely(rlen < EXT4_DIR_REC_LEN(1)))
10 + if (unlikely(rlen < __EXT4_DIR_REC_LEN(1)))
11 error_msg = "rec_len is smaller than minimal";
12 else if (unlikely(rlen % 4 != 0))
13 error_msg = "rec_len % 4 != 0";
14 - else if (unlikely(rlen < EXT4_DIR_REC_LEN(de->name_len)))
15 + else if (unlikely(rlen < EXT4_DIR_REC_LEN(de)))
16 error_msg = "rec_len is too small for name_len";
17 else if (unlikely(((char *) de - buf) + rlen > size))
18 error_msg = "directory entry across range";
19 @@ -205,7 +205,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx)
20 * failure will be detected in the
21 * dirent test below. */
22 if (ext4_rec_len_from_disk(de->rec_len,
23 - sb->s_blocksize) < EXT4_DIR_REC_LEN(1))
24 + sb->s_blocksize) < __EXT4_DIR_REC_LEN(1))
26 i += ext4_rec_len_from_disk(de->rec_len,
28 @@ -424,12 +424,17 @@ int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,
29 struct fname *fname, *new_fn;
30 struct dir_private_info *info;
34 info = dir_file->private_data;
35 p = &info->root.rb_node;
37 /* Create and allocate the fname structure */
38 - len = sizeof(struct fname) + ent_name->len + 1;
39 + if (dirent->file_type & EXT4_DIRENT_LUFID)
40 + extra_data = ext4_get_dirent_data_len(dirent);
42 + len = sizeof(struct fname) + ent_name->len + extra_data + 1;
44 new_fn = kzalloc(len, GFP_KERNEL);
47 @@ -438,7 +443,7 @@ int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,
48 new_fn->inode = le32_to_cpu(dirent->inode);
49 new_fn->name_len = ent_name->len;
50 new_fn->file_type = dirent->file_type;
51 - memcpy(new_fn->name, ent_name->name, ent_name->len);
52 + memcpy(new_fn->name, ent_name->name, ent_name->len + extra_data);
53 new_fn->name[ent_name->len] = 0;
56 @@ -621,7 +626,7 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,
57 if (ext4_check_dir_entry(dir, NULL, de, bh,
58 buf, buf_size, offset))
60 - nlen = EXT4_DIR_REC_LEN(de->name_len);
61 + nlen = EXT4_DIR_REC_LEN(de);
62 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
63 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
65 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
66 index 613538c..10a2a86 100644
69 @@ -1069,6 +1069,7 @@ struct ext4_inode_info {
70 #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
71 #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
72 #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
73 +#define EXT4_MOUNT_DIRDATA 0x40000 /* Data in directory entries*/
74 #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
75 #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
76 #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
77 @@ -1781,6 +1782,7 @@ EXT4_FEATURE_INCOMPAT_FUNCS(encrypt, ENCRYPT)
78 EXT4_FEATURE_INCOMPAT_64BIT| \
79 EXT4_FEATURE_INCOMPAT_FLEX_BG| \
80 EXT4_FEATURE_INCOMPAT_MMP | \
81 + EXT4_FEATURE_INCOMPAT_DIRDATA| \
82 EXT4_FEATURE_INCOMPAT_INLINE_DATA | \
83 EXT4_FEATURE_INCOMPAT_ENCRYPT | \
84 EXT4_FEATURE_INCOMPAT_CSUM_SEED)
85 @@ -1937,6 +1939,43 @@ struct ext4_dir_entry_tail {
86 #define EXT4_FT_SYMLINK 7
89 +#define EXT4_FT_MASK 0xf
91 +#if EXT4_FT_MAX > EXT4_FT_MASK
92 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
96 + * d_type has 4 unused bits, so it can hold four types data. these different
97 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
98 + * stored, in flag order, after file-name in ext4 dirent.
101 + * this flag is added to d_type if ext4 dirent has extra data after
102 + * filename. this data length is variable and length is stored in first byte
103 + * of data. data start after filename NUL byte.
104 + * This is used by Lustre FS.
106 +#define EXT4_DIRENT_LUFID 0x10
108 +#define EXT4_LUFID_MAGIC 0xAD200907UL
109 +struct ext4_dentry_param {
110 + __u32 edp_magic; /* EXT4_LUFID_MAGIC */
111 + char edp_len; /* size of edp_data in bytes */
112 + char edp_data[0]; /* packed array of data */
115 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
116 + struct ext4_dentry_param *p)
119 + if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_DIRDATA))
121 + if (p && p->edp_magic == EXT4_LUFID_MAGIC)
122 + return &p->edp_len;
127 #define EXT4_FT_DIR_CSUM 0xDE
129 @@ -1947,8 +1986,11 @@ struct ext4_dir_entry_tail {
131 #define EXT4_DIR_PAD 4
132 #define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
133 -#define EXT4_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT4_DIR_ROUND) & \
134 +#define __EXT4_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT4_DIR_ROUND) & \
136 +#define EXT4_DIR_REC_LEN(de) (__EXT4_DIR_REC_LEN((de)->name_len +\
137 + ext4_get_dirent_data_len(de)))
139 #define EXT4_MAX_REC_LEN ((1<<16)-1)
142 @@ -2407,12 +2449,12 @@ extern int ext4_find_dest_de(struct inode *dir, struct inode *inode,
143 struct buffer_head *bh,
144 void *buf, int buf_size,
145 struct ext4_filename *fname,
146 - struct ext4_dir_entry_2 **dest_de);
147 + struct ext4_dir_entry_2 **dest_de, int *dlen);
148 int ext4_insert_dentry(struct inode *dir,
150 struct ext4_dir_entry_2 *de,
152 - struct ext4_filename *fname);
153 + struct ext4_filename *fname, void *data);
154 static inline void ext4_update_dx_flag(struct inode *inode)
156 if (!ext4_has_feature_dir_index(inode->i_sb))
157 @@ -2424,10 +2466,17 @@ static unsigned char ext4_filetype_table[] = {
159 static inline unsigned char get_dtype(struct super_block *sb, int filetype)
161 - if (!ext4_has_feature_filetype(sb) || filetype >= EXT4_FT_MAX)
162 + int fl_index = filetype & EXT4_FT_MASK;
164 + if (!ext4_has_feature_filetype(sb) || fl_index >= EXT4_FT_MAX)
167 - return ext4_filetype_table[filetype];
168 + if (!test_opt(sb, DIRDATA))
169 + return ext4_filetype_table[fl_index];
171 + return (ext4_filetype_table[fl_index]) |
172 + (filetype & EXT4_DIRENT_LUFID);
175 extern int ext4_check_all_de(struct inode *dir, struct buffer_head *bh,
176 void *buf, int buf_size);
177 @@ -2575,6 +2624,8 @@ extern struct inode *ext4_create_inode(handle_t *handle,
178 extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
179 struct ext4_dir_entry_2 *de_del,
180 struct buffer_head *bh);
181 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
182 + struct inode *inode, const void *, const void *);
183 extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
184 __u32 start_minor_hash, __u32 *next_hash);
185 extern int ext4_search_dir(struct buffer_head *bh,
186 @@ -3292,6 +3343,28 @@ extern struct mutex ext4__aio_mutex[EXT4_WQ_HASH_SZ];
187 extern int ext4_resize_begin(struct super_block *sb);
188 extern void ext4_resize_end(struct super_block *sb);
191 + * Compute the total directory entry data length.
192 + * This includes the filename and an implicit NUL terminator (always present),
193 + * and optional extensions. Each extension has a bit set in the high 4 bits of
194 + * de->file_type, and the extension length is the first byte in each entry.
196 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
198 + char *len = de->name + de->name_len + 1 /* NUL terminator */;
200 + __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
202 + while (extra_data_flags) {
203 + if (extra_data_flags & 1) {
204 + dlen += *len + (dlen == 0);
207 + extra_data_flags >>= 1;
212 #endif /* __KERNEL__ */
214 #define EFSBADCRC EBADMSG /* Bad CRC detected */
215 diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
216 index d884989..53e8a88 100644
217 --- a/fs/ext4/inline.c
218 +++ b/fs/ext4/inline.c
219 @@ -1005,7 +1005,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
220 struct ext4_dir_entry_2 *de;
222 err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
223 - inline_size, fname, &de);
224 + inline_size, fname, &de, NULL);
228 @@ -1013,7 +1013,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
229 err = ext4_journal_get_write_access(handle, iloc->bh);
232 - ext4_insert_dentry(dir, inode, de, inline_size, fname);
233 + ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
235 ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
237 @@ -1083,7 +1083,7 @@ static int ext4_update_inline_dir(handle_t *handle, struct inode *dir,
238 int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
239 int new_size = get_max_inline_xattr_value_size(dir, iloc);
241 - if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
242 + if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
245 ret = ext4_update_inline_data(handle, dir,
246 @@ -1366,7 +1366,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
248 strcpy(fake.name, ".");
249 fake.rec_len = ext4_rec_len_to_disk(
250 - EXT4_DIR_REC_LEN(fake.name_len),
251 + EXT4_DIR_REC_LEN(&fake),
253 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
255 @@ -1376,7 +1376,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
257 strcpy(fake.name, "..");
258 fake.rec_len = ext4_rec_len_to_disk(
259 - EXT4_DIR_REC_LEN(fake.name_len),
260 + EXT4_DIR_REC_LEN(&fake),
262 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
264 @@ -1474,8 +1474,8 @@ int ext4_read_inline_dir(struct file *file,
265 * So we will use extra_offset and extra_size to indicate them
266 * during the inline dir iteration.
268 - dotdot_offset = EXT4_DIR_REC_LEN(1);
269 - dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
270 + dotdot_offset = __EXT4_DIR_REC_LEN(1);
271 + dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
272 extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
273 extra_size = extra_offset + inline_size;
275 @@ -1510,7 +1510,7 @@ int ext4_read_inline_dir(struct file *file,
276 * failure will be detected in the
277 * dirent test below. */
278 if (ext4_rec_len_from_disk(de->rec_len, extra_size)
279 - < EXT4_DIR_REC_LEN(1))
280 + < __EXT4_DIR_REC_LEN(1))
282 i += ext4_rec_len_from_disk(de->rec_len,
284 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
285 index 73d73fb..f6465b6 100644
286 --- a/fs/ext4/namei.c
287 +++ b/fs/ext4/namei.c
288 @@ -241,7 +241,8 @@ static unsigned dx_get_count(struct dx_entry *entries);
289 static unsigned dx_get_limit(struct dx_entry *entries);
290 static void dx_set_count(struct dx_entry *entries, unsigned value);
291 static void dx_set_limit(struct dx_entry *entries, unsigned value);
292 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
293 +static inline unsigned dx_root_limit(struct inode *dir,
294 + struct ext4_dir_entry_2 *dot_de, unsigned infosize);
295 static unsigned dx_node_limit(struct inode *dir);
296 static struct dx_frame *dx_probe(struct ext4_filename *fname,
298 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize)
300 struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
302 + BUG_ON(de->name_len != 1);
303 /* get dotdot first */
304 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
305 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
307 /* dx root info is after dotdot entry */
308 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
309 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
311 return (struct dx_root_info *)de;
313 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct dx_entry *entries, unsigned value)
314 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
317 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
318 +static inline unsigned dx_root_limit(struct inode *dir,
319 + struct ext4_dir_entry_2 *dot_de, unsigned infosize)
321 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
322 - EXT4_DIR_REC_LEN(2) - infosize;
323 + struct ext4_dir_entry_2 *dotdot_de;
324 + unsigned entry_space;
326 + BUG_ON(dot_de->name_len != 1);
327 + dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
328 + entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
329 + EXT4_DIR_REC_LEN(dotdot_de) - infosize;
331 if (ext4_has_metadata_csum(dir->i_sb))
332 entry_space -= sizeof(struct dx_tail);
333 @@ -565,7 +573,7 @@ static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
335 static inline unsigned dx_node_limit(struct inode *dir)
337 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
338 + unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
340 if (ext4_has_metadata_csum(dir->i_sb))
341 entry_space -= sizeof(struct dx_tail);
342 @@ -674,7 +682,7 @@ static struct stats dx_show_leaf(struct inode *dir,
343 (unsigned) ((char *) de - base));
346 - space += EXT4_DIR_REC_LEN(de->name_len);
347 + space += EXT4_DIR_REC_LEN(de);
350 de = ext4_next_entry(de, size);
351 @@ -775,11 +783,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir,
353 entries = (struct dx_entry *)(((char *)info) + info->info_length);
355 - if (dx_get_limit(entries) != dx_root_limit(dir,
356 - info->info_length)) {
357 + if (dx_get_limit(entries) !=
358 + dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
359 + info->info_length)) {
360 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
361 dx_get_limit(entries),
362 - dx_root_limit(dir, info->info_length));
364 + (struct ext4_dir_entry_2 *)frame->bh->b_data,
365 + info->info_length));
369 @@ -963,7 +974,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,
370 de = (struct ext4_dir_entry_2 *) bh->b_data;
371 top = (struct ext4_dir_entry_2 *) ((char *) de +
372 dir->i_sb->s_blocksize -
373 - EXT4_DIR_REC_LEN(0));
374 + __EXT4_DIR_REC_LEN(0));
375 #ifdef CONFIG_EXT4_FS_ENCRYPTION
376 /* Check if the directory is encrypted */
377 if (ext4_encrypted_inode(dir)) {
378 @@ -1665,7 +1676,7 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count,
380 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
381 (from + (map->offs<<2));
382 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
383 + rec_len = EXT4_DIR_REC_LEN(de);
384 memcpy (to, de, rec_len);
385 ((struct ext4_dir_entry_2 *) to)->rec_len =
386 ext4_rec_len_to_disk(rec_len, blocksize);
387 @@ -1689,7 +1700,7 @@ static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize)
388 while ((char*)de < base + blocksize) {
389 next = ext4_next_entry(de, blocksize);
390 if (de->inode && de->name_len) {
391 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
392 + rec_len = EXT4_DIR_REC_LEN(de);
394 memmove(to, de, rec_len);
395 to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
396 @@ -1820,15 +1831,17 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode,
397 struct buffer_head *bh,
398 void *buf, int buf_size,
399 struct ext4_filename *fname,
400 - struct ext4_dir_entry_2 **dest_de)
401 + struct ext4_dir_entry_2 **dest_de, int *dlen)
403 struct ext4_dir_entry_2 *de;
404 - unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
405 + unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
406 + (dlen ? *dlen : 0);
408 unsigned int offset = 0;
412 + dlen ? *dlen = 0 : 0; /* default set to 0 */
413 de = (struct ext4_dir_entry_2 *)buf;
414 top = buf + buf_size - reclen;
415 while ((char *) de <= top) {
416 @@ -1845,10 +1858,26 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode,
420 - nlen = EXT4_DIR_REC_LEN(de->name_len);
421 + nlen = EXT4_DIR_REC_LEN(de);
422 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
423 if ((de->inode ? rlen - nlen : rlen) >= reclen)
425 + /* Then for dotdot entries, check for the smaller space
426 + * required for just the entry, no FID */
427 + if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
428 + if ((de->inode ? rlen - nlen : rlen) >=
429 + __EXT4_DIR_REC_LEN(fname_len(fname))) {
430 + /* set dlen=1 to indicate not
431 + * enough space store fid */
432 + dlen ? *dlen = 1 : 0;
435 + /* The new ".." entry must be written over the
436 + * previous ".." entry, which is the first
437 + * entry traversed by this scan. If it doesn't
438 + * fit, something is badly wrong, so -EIO. */
441 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
444 @@ -1867,12 +1896,12 @@ int ext4_insert_dentry(struct inode *dir,
446 struct ext4_dir_entry_2 *de,
448 - struct ext4_filename *fname)
449 + struct ext4_filename *fname, void *data)
454 - nlen = EXT4_DIR_REC_LEN(de->name_len);
455 + nlen = EXT4_DIR_REC_LEN(de);
456 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
458 struct ext4_dir_entry_2 *de1 =
459 @@ -1886,6 +1915,11 @@ int ext4_insert_dentry(struct inode *dir,
460 ext4_set_de_type(inode->i_sb, de, inode->i_mode);
461 de->name_len = fname_len(fname);
462 memcpy(de->name, fname_name(fname), fname_len(fname));
464 + de->name[fname_len(fname)] = 0;
465 + memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
466 + de->file_type |= EXT4_DIRENT_LUFID;
471 @@ -1900,18 +1934,23 @@ int ext4_insert_dentry(struct inode *dir,
472 static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
474 struct inode *inode, struct ext4_dir_entry_2 *de,
475 - struct buffer_head *bh)
476 + struct buffer_head *bh, struct dentry *dentry)
478 unsigned int blocksize = dir->i_sb->s_blocksize;
482 + unsigned char *data;
484 + data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
486 if (ext4_has_metadata_csum(inode->i_sb))
487 csum_size = sizeof(struct ext4_dir_entry_tail);
491 + dlen = (*data) + 1;
492 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
493 - blocksize - csum_size, fname, &de);
494 + blocksize - csum_size, fname, &de, &dlen);
498 @@ -1924,7 +1963,10 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
500 /* By now the buffer is marked for journaling. Due to crypto operations,
501 * the following function call may fail */
502 - err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
503 + /* If writing the short form of "dotdot", don't add the data section */
506 + err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
510 @@ -2036,7 +2078,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
512 dx_set_block(entries, 1);
513 dx_set_count(entries, 1);
514 - dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
515 + dx_set_limit(entries, dx_root_limit(dir,
516 + dot_de, sizeof(*dx_info)));
518 /* Initialize as for dx_probe */
519 fname->hinfo.hash_version = dx_info->hash_version;
520 @@ -2066,7 +2109,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
524 - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
525 + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
529 @@ -2088,6 +2131,8 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
530 struct buffer_head *dir_block;
531 struct ext4_dir_entry_2 *de;
532 int len, journal = 0, err = 0;
537 return PTR_ERR(handle);
538 @@ -2105,19 +2150,24 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
539 /* the first item must be "." */
540 assert(de->name_len == 1 && de->name[0] == '.');
541 len = le16_to_cpu(de->rec_len);
542 - assert(len >= EXT4_DIR_REC_LEN(1));
543 - if (len > EXT4_DIR_REC_LEN(1)) {
544 + assert(len >= __EXT4_DIR_REC_LEN(1));
545 + if (len > __EXT4_DIR_REC_LEN(1)) {
546 BUFFER_TRACE(dir_block, "get_write_access");
547 err = ext4_journal_get_write_access(handle, dir_block);
552 - de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
553 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
556 - len -= EXT4_DIR_REC_LEN(1);
557 - assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
558 + len -= EXT4_DIR_REC_LEN(de);
559 + data = ext4_dentry_get_data(dir->i_sb,
560 + (struct ext4_dentry_param *)dentry->d_fsdata);
563 + assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
565 de = (struct ext4_dir_entry_2 *)
566 ((char *) de + le16_to_cpu(de->rec_len));
568 @@ -2131,10 +2181,15 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
570 de->rec_len = cpu_to_le16(len);
572 - assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
573 + assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
575 strcpy(de->name, "..");
576 - ext4_set_de_type(dir->i_sb, de, S_IFDIR);
577 + if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
579 + memcpy(&de->name[2 + 1], data, *data);
580 + ext4_set_de_type(dir->i_sb, de, S_IFDIR);
581 + de->file_type |= EXT4_DIRENT_LUFID;
586 @@ -2216,7 +2271,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
589 retval = add_dirent_to_buf(handle, &fname, dir, inode,
592 if (retval != -ENOSPC)
595 @@ -2244,7 +2299,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
596 initialize_dirent_tail(t, blocksize);
599 - retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
600 + retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
602 ext4_fname_free_filename(&fname);
604 @@ -2284,7 +2339,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
608 - err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
609 + err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
613 @@ -2388,7 +2443,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
617 - err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
618 + err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
622 @@ -2663,37 +2718,70 @@ err_unlock_inode:
627 + struct inode *inode;
632 struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
633 struct ext4_dir_entry_2 *de,
634 int blocksize, int csum_size,
635 unsigned int parent_ino, int dotdot_real_len)
637 + void *data1 = NULL, *data2 = NULL;
638 + int dot_reclen = 0;
640 + if (dotdot_real_len == 10) {
641 + struct tp_block *tpb = (struct tp_block *)inode;
642 + data1 = tpb->data1;
643 + data2 = tpb->data2;
644 + inode = tpb->inode;
645 + dotdot_real_len = 0;
647 de->inode = cpu_to_le32(inode->i_ino);
649 - de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
651 strcpy(de->name, ".");
652 ext4_set_de_type(inode->i_sb, de, S_IFDIR);
654 + /* get packed fid data*/
655 + data1 = ext4_dentry_get_data(inode->i_sb,
656 + (struct ext4_dentry_param *) data1);
659 + memcpy(&de->name[2], data1, *(char *) data1);
660 + de->file_type |= EXT4_DIRENT_LUFID;
662 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
663 + dot_reclen = cpu_to_le16(de->rec_len);
664 de = ext4_next_entry(de, blocksize);
665 de->inode = cpu_to_le32(parent_ino);
667 + strcpy(de->name, "..");
668 + ext4_set_de_type(inode->i_sb, de, S_IFDIR);
669 + data2 = ext4_dentry_get_data(inode->i_sb,
670 + (struct ext4_dentry_param *) data2);
673 + memcpy(&de->name[3], data2, *(char *) data2);
674 + de->file_type |= EXT4_DIRENT_LUFID;
676 if (!dotdot_real_len)
677 de->rec_len = ext4_rec_len_to_disk(blocksize -
678 - (csum_size + EXT4_DIR_REC_LEN(1)),
679 + (csum_size + dot_reclen),
682 de->rec_len = ext4_rec_len_to_disk(
683 - EXT4_DIR_REC_LEN(de->name_len), blocksize);
684 - strcpy(de->name, "..");
685 - ext4_set_de_type(inode->i_sb, de, S_IFDIR);
686 + EXT4_DIR_REC_LEN(de), blocksize);
688 return ext4_next_entry(de, blocksize);
691 static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
692 - struct inode *inode)
693 + struct inode *inode,
694 + const void *data1, const void *data2)
696 + struct tp_block param;
697 struct buffer_head *dir_block = NULL;
698 struct ext4_dir_entry_2 *de;
699 struct ext4_dir_entry_tail *t;
700 @@ -2718,7 +2806,11 @@ static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
701 if (IS_ERR(dir_block))
702 return PTR_ERR(dir_block);
703 de = (struct ext4_dir_entry_2 *)dir_block->b_data;
704 - ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
705 + param.inode = inode;
706 + param.data1 = (void *)data1;
707 + param.data2 = (void *)data2;
708 + ext4_init_dot_dotdot((struct inode *)(¶m), de, blocksize,
709 + csum_size, dir->i_ino, 10);
712 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
713 @@ -2735,6 +2827,29 @@ out:
717 +/* Initialize @inode as a subdirectory of @dir, and add the
718 + * "." and ".." entries into the first directory block. */
719 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
720 + struct inode *inode,
721 + const void *data1, const void *data2)
725 + if (IS_ERR(handle))
726 + return PTR_ERR(handle);
728 + if (IS_DIRSYNC(dir))
729 + ext4_handle_sync(handle);
731 + inode->i_op = &ext4_dir_inode_operations;
732 + inode->i_fop = &ext4_dir_operations;
733 + rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
735 + rc = ext4_mark_inode_dirty(handle, inode);
738 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
740 static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
743 @@ -2761,7 +2876,7 @@ retry:
745 inode->i_op = &ext4_dir_inode_operations;
746 inode->i_fop = &ext4_dir_operations;
747 - err = ext4_init_new_dir(handle, dir, inode);
748 + err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
750 goto out_clear_inode;
751 err = ext4_mark_inode_dirty(handle, inode);
752 @@ -2813,7 +2928,7 @@ int ext4_empty_dir(struct inode *inode)
756 - if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
757 + if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
758 EXT4_ERROR_INODE(inode, "invalid size");
761 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
762 index 7715539..f48b36e 100644
763 --- a/fs/ext4/super.c
764 +++ b/fs/ext4/super.c
765 @@ -1159,7 +1159,7 @@ enum {
766 Opt_data_err_abort, Opt_data_err_ignore, Opt_test_dummy_encryption,
767 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
768 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
769 - Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
770 + Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
771 Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
772 Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
773 Opt_lazytime, Opt_nolazytime,
774 @@ -1230,6 +1230,7 @@ static const match_table_t tokens = {
775 {Opt_lazytime, "lazytime"},
776 {Opt_nolazytime, "nolazytime"},
777 {Opt_nodelalloc, "nodelalloc"},
778 + {Opt_dirdata, "dirdata"},
779 {Opt_removed, "mblk_io_submit"},
780 {Opt_removed, "nomblk_io_submit"},
781 {Opt_block_validity, "block_validity"},
782 @@ -1444,6 +1445,7 @@ static const struct mount_opts {
783 {Opt_usrjquota, 0, MOPT_Q},
784 {Opt_grpjquota, 0, MOPT_Q},
785 {Opt_offusrjquota, 0, MOPT_Q},
786 + {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
787 {Opt_offgrpjquota, 0, MOPT_Q},
788 {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
789 {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},