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,36 @@ 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;
201 + struct ext4_dir_entry_tail *t = (struct ext4_dir_entry_tail *)de;
203 + if (!t->det_reserved_zero1 &&
204 + le16_to_cpu(t->det_rec_len) ==
205 + sizeof(struct ext4_dir_entry_tail) &&
206 + !t->det_reserved_zero2 &&
207 + t->det_reserved_ft == EXT4_FT_DIR_CSUM)
210 + while (extra_data_flags) {
211 + if (extra_data_flags & 1) {
212 + dlen += *len + (dlen == 0);
215 + extra_data_flags >>= 1;
220 #endif /* __KERNEL__ */
222 #define EFSBADCRC EBADMSG /* Bad CRC detected */
223 diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
224 index d884989..53e8a88 100644
225 --- a/fs/ext4/inline.c
226 +++ b/fs/ext4/inline.c
227 @@ -1005,7 +1005,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
228 struct ext4_dir_entry_2 *de;
230 err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
231 - inline_size, fname, &de);
232 + inline_size, fname, &de, NULL);
236 @@ -1013,7 +1013,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
237 err = ext4_journal_get_write_access(handle, iloc->bh);
240 - ext4_insert_dentry(dir, inode, de, inline_size, fname);
241 + ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
243 ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
245 @@ -1083,7 +1083,7 @@ static int ext4_update_inline_dir(handle_t *handle, struct inode *dir,
246 int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
247 int new_size = get_max_inline_xattr_value_size(dir, iloc);
249 - if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
250 + if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
253 ret = ext4_update_inline_data(handle, dir,
254 @@ -1366,7 +1366,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
256 strcpy(fake.name, ".");
257 fake.rec_len = ext4_rec_len_to_disk(
258 - EXT4_DIR_REC_LEN(fake.name_len),
259 + EXT4_DIR_REC_LEN(&fake),
261 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
263 @@ -1376,7 +1376,7 @@ int htree_inlinedir_to_tree(struct file *dir_file,
265 strcpy(fake.name, "..");
266 fake.rec_len = ext4_rec_len_to_disk(
267 - EXT4_DIR_REC_LEN(fake.name_len),
268 + EXT4_DIR_REC_LEN(&fake),
270 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
272 @@ -1474,8 +1474,8 @@ int ext4_read_inline_dir(struct file *file,
273 * So we will use extra_offset and extra_size to indicate them
274 * during the inline dir iteration.
276 - dotdot_offset = EXT4_DIR_REC_LEN(1);
277 - dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
278 + dotdot_offset = __EXT4_DIR_REC_LEN(1);
279 + dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
280 extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
281 extra_size = extra_offset + inline_size;
283 @@ -1510,7 +1510,7 @@ int ext4_read_inline_dir(struct file *file,
284 * failure will be detected in the
285 * dirent test below. */
286 if (ext4_rec_len_from_disk(de->rec_len, extra_size)
287 - < EXT4_DIR_REC_LEN(1))
288 + < __EXT4_DIR_REC_LEN(1))
290 i += ext4_rec_len_from_disk(de->rec_len,
292 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
293 index e90dd58..11bc299 100644
294 --- a/fs/ext4/namei.c
295 +++ b/fs/ext4/namei.c
296 @@ -241,7 +241,8 @@ static unsigned dx_get_count(struct dx_entry *entries);
297 static unsigned dx_get_limit(struct dx_entry *entries);
298 static void dx_set_count(struct dx_entry *entries, unsigned value);
299 static void dx_set_limit(struct dx_entry *entries, unsigned value);
300 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
301 +static inline unsigned dx_root_limit(struct inode *dir,
302 + struct ext4_dir_entry_2 *dot_de, unsigned infosize);
303 static unsigned dx_node_limit(struct inode *dir);
304 static struct dx_frame *dx_probe(struct ext4_filename *fname,
306 @@ -384,22 +385,23 @@ static struct dx_countlimit *get_dx_coun
308 struct ext4_dir_entry *dp;
309 struct dx_root_info *root;
311 + int count_offset, dot_rec_len, dotdot_rec_len;
313 if (le16_to_cpu(dirent->rec_len) == EXT4_BLOCK_SIZE(inode->i_sb))
315 - else if (le16_to_cpu(dirent->rec_len) == 12) {
316 - dp = (struct ext4_dir_entry *)(((void *)dirent) + 12);
318 + dot_rec_len = le16_to_cpu(dirent->rec_len);
319 + dp = (struct ext4_dir_entry *)(((void *)dirent) + dot_rec_len);
320 if (le16_to_cpu(dp->rec_len) !=
321 - EXT4_BLOCK_SIZE(inode->i_sb) - 12)
322 + EXT4_BLOCK_SIZE(inode->i_sb) - dot_rec_len)
324 - root = (struct dx_root_info *)(((void *)dp + 12));
325 + dotdot_rec_len = EXT4_DIR_REC_LEN((struct ext4_dir_entry_2 *)dp);
326 + root = (struct dx_root_info *)(((void *)dp + dotdot_rec_len));
327 if (root->reserved_zero ||
328 root->info_length != sizeof(struct dx_root_info))
333 + count_offset = 8 + dot_rec_len + dotdot_rec_len;
337 *offset = count_offset;
338 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2 *p, unsigned long blocksize)
340 struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
342 + BUG_ON(de->name_len != 1);
343 /* get dotdot first */
344 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
345 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
347 /* dx root info is after dotdot entry */
348 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
349 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
351 return (struct dx_root_info *)de;
353 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct dx_entry *entries, unsigned value)
354 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
357 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
358 +static inline unsigned dx_root_limit(struct inode *dir,
359 + struct ext4_dir_entry_2 *dot_de, unsigned infosize)
361 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
362 - EXT4_DIR_REC_LEN(2) - infosize;
363 + struct ext4_dir_entry_2 *dotdot_de;
364 + unsigned entry_space;
366 + BUG_ON(dot_de->name_len != 1);
367 + dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
368 + entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
369 + EXT4_DIR_REC_LEN(dotdot_de) - infosize;
371 if (ext4_has_metadata_csum(dir->i_sb))
372 entry_space -= sizeof(struct dx_tail);
373 @@ -565,7 +573,7 @@ static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
375 static inline unsigned dx_node_limit(struct inode *dir)
377 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
378 + unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
380 if (ext4_has_metadata_csum(dir->i_sb))
381 entry_space -= sizeof(struct dx_tail);
382 @@ -674,7 +682,7 @@ static struct stats dx_show_leaf(struct inode *dir,
383 (unsigned) ((char *) de - base));
386 - space += EXT4_DIR_REC_LEN(de->name_len);
387 + space += EXT4_DIR_REC_LEN(de);
390 de = ext4_next_entry(de, size);
391 @@ -775,11 +783,14 @@ dx_probe(struct ext4_filename *fname, struct inode *dir,
393 entries = (struct dx_entry *)(((char *)info) + info->info_length);
395 - if (dx_get_limit(entries) != dx_root_limit(dir,
396 - info->info_length)) {
397 + if (dx_get_limit(entries) !=
398 + dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
399 + info->info_length)) {
400 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
401 dx_get_limit(entries),
402 - dx_root_limit(dir, info->info_length));
404 + (struct ext4_dir_entry_2 *)frame->bh->b_data,
405 + info->info_length));
409 @@ -963,7 +974,7 @@ static int htree_dirblock_to_tree(struct file *dir_file,
410 de = (struct ext4_dir_entry_2 *) bh->b_data;
411 top = (struct ext4_dir_entry_2 *) ((char *) de +
412 dir->i_sb->s_blocksize -
413 - EXT4_DIR_REC_LEN(0));
414 + __EXT4_DIR_REC_LEN(0));
415 #ifdef CONFIG_EXT4_FS_ENCRYPTION
416 /* Check if the directory is encrypted */
417 if (ext4_encrypted_inode(dir)) {
418 @@ -1665,7 +1676,7 @@ dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count,
420 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
421 (from + (map->offs<<2));
422 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
423 + rec_len = EXT4_DIR_REC_LEN(de);
424 memcpy (to, de, rec_len);
425 ((struct ext4_dir_entry_2 *) to)->rec_len =
426 ext4_rec_len_to_disk(rec_len, blocksize);
427 @@ -1689,7 +1700,7 @@ static struct ext4_dir_entry_2* dx_pack_dirents(char *base, unsigned blocksize)
428 while ((char*)de < base + blocksize) {
429 next = ext4_next_entry(de, blocksize);
430 if (de->inode && de->name_len) {
431 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
432 + rec_len = EXT4_DIR_REC_LEN(de);
434 memmove(to, de, rec_len);
435 to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
436 @@ -1820,15 +1831,17 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode,
437 struct buffer_head *bh,
438 void *buf, int buf_size,
439 struct ext4_filename *fname,
440 - struct ext4_dir_entry_2 **dest_de)
441 + struct ext4_dir_entry_2 **dest_de, int *dlen)
443 struct ext4_dir_entry_2 *de;
444 - unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
445 + unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
446 + (dlen ? *dlen : 0);
448 unsigned int offset = 0;
452 + dlen ? *dlen = 0 : 0; /* default set to 0 */
453 de = (struct ext4_dir_entry_2 *)buf;
454 top = buf + buf_size - reclen;
455 while ((char *) de <= top) {
456 @@ -1845,10 +1858,26 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode,
460 - nlen = EXT4_DIR_REC_LEN(de->name_len);
461 + nlen = EXT4_DIR_REC_LEN(de);
462 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
463 if ((de->inode ? rlen - nlen : rlen) >= reclen)
465 + /* Then for dotdot entries, check for the smaller space
466 + * required for just the entry, no FID */
467 + if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
468 + if ((de->inode ? rlen - nlen : rlen) >=
469 + __EXT4_DIR_REC_LEN(fname_len(fname))) {
470 + /* set dlen=1 to indicate not
471 + * enough space store fid */
472 + dlen ? *dlen = 1 : 0;
475 + /* The new ".." entry must be written over the
476 + * previous ".." entry, which is the first
477 + * entry traversed by this scan. If it doesn't
478 + * fit, something is badly wrong, so -EIO. */
481 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
484 @@ -1867,12 +1896,12 @@ int ext4_insert_dentry(struct inode *dir,
486 struct ext4_dir_entry_2 *de,
488 - struct ext4_filename *fname)
489 + struct ext4_filename *fname, void *data)
494 - nlen = EXT4_DIR_REC_LEN(de->name_len);
495 + nlen = EXT4_DIR_REC_LEN(de);
496 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
498 struct ext4_dir_entry_2 *de1 =
499 @@ -1886,6 +1915,11 @@ int ext4_insert_dentry(struct inode *dir,
500 ext4_set_de_type(inode->i_sb, de, inode->i_mode);
501 de->name_len = fname_len(fname);
502 memcpy(de->name, fname_name(fname), fname_len(fname));
504 + de->name[fname_len(fname)] = 0;
505 + memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
506 + de->file_type |= EXT4_DIRENT_LUFID;
511 @@ -1900,18 +1934,23 @@ int ext4_insert_dentry(struct inode *dir,
512 static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
514 struct inode *inode, struct ext4_dir_entry_2 *de,
515 - struct buffer_head *bh)
516 + struct buffer_head *bh, struct dentry *dentry)
518 unsigned int blocksize = dir->i_sb->s_blocksize;
522 + unsigned char *data;
524 + data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
526 if (ext4_has_metadata_csum(inode->i_sb))
527 csum_size = sizeof(struct ext4_dir_entry_tail);
531 + dlen = (*data) + 1;
532 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
533 - blocksize - csum_size, fname, &de);
534 + blocksize - csum_size, fname, &de, &dlen);
538 @@ -1924,7 +1963,10 @@ static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
540 /* By now the buffer is marked for journaling. Due to crypto operations,
541 * the following function call may fail */
542 - err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
543 + /* If writing the short form of "dotdot", don't add the data section */
546 + err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
550 @@ -2036,7 +2078,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
552 dx_set_block(entries, 1);
553 dx_set_count(entries, 1);
554 - dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
555 + dx_set_limit(entries, dx_root_limit(dir,
556 + dot_de, sizeof(*dx_info)));
558 /* Initialize as for dx_probe */
559 fname->hinfo.hash_version = dx_info->hash_version;
560 @@ -2064,7 +2107,7 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
564 - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
565 + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
568 * Even if the block split failed, we have to properly write
569 @@ -2086,6 +2129,8 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
570 struct buffer_head *dir_block;
571 struct ext4_dir_entry_2 *de;
572 int len, journal = 0, err = 0;
577 return PTR_ERR(handle);
578 @@ -2103,19 +2148,24 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
579 /* the first item must be "." */
580 assert(de->name_len == 1 && de->name[0] == '.');
581 len = le16_to_cpu(de->rec_len);
582 - assert(len >= EXT4_DIR_REC_LEN(1));
583 - if (len > EXT4_DIR_REC_LEN(1)) {
584 + assert(len >= __EXT4_DIR_REC_LEN(1));
585 + if (len > __EXT4_DIR_REC_LEN(1)) {
586 BUFFER_TRACE(dir_block, "get_write_access");
587 err = ext4_journal_get_write_access(handle, dir_block);
592 - de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
593 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
596 - len -= EXT4_DIR_REC_LEN(1);
597 - assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
598 + len -= EXT4_DIR_REC_LEN(de);
599 + data = ext4_dentry_get_data(dir->i_sb,
600 + (struct ext4_dentry_param *)dentry->d_fsdata);
603 + assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
605 de = (struct ext4_dir_entry_2 *)
606 ((char *) de + le16_to_cpu(de->rec_len));
608 @@ -2129,10 +2179,15 @@ static int ext4_update_dotdot(handle_t *handle, struct dentry *dentry,
610 de->rec_len = cpu_to_le16(len);
612 - assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
613 + assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
615 strcpy(de->name, "..");
616 - ext4_set_de_type(dir->i_sb, de, S_IFDIR);
617 + if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
619 + memcpy(&de->name[2 + 1], data, *data);
620 + ext4_set_de_type(dir->i_sb, de, S_IFDIR);
621 + de->file_type |= EXT4_DIRENT_LUFID;
626 @@ -2214,7 +2269,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
629 retval = add_dirent_to_buf(handle, &fname, dir, inode,
632 if (retval != -ENOSPC)
635 @@ -2242,7 +2297,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
636 initialize_dirent_tail(t, blocksize);
639 - retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
640 + retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
642 ext4_fname_free_filename(&fname);
644 @@ -2282,7 +2337,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
648 - err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
649 + err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
653 @@ -2386,7 +2441,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
657 - err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
658 + err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
662 @@ -2661,37 +2716,70 @@ err_unlock_inode:
667 + struct inode *inode;
672 struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
673 struct ext4_dir_entry_2 *de,
674 int blocksize, int csum_size,
675 unsigned int parent_ino, int dotdot_real_len)
677 + void *data1 = NULL, *data2 = NULL;
678 + int dot_reclen = 0;
680 + if (dotdot_real_len == 10) {
681 + struct tp_block *tpb = (struct tp_block *)inode;
682 + data1 = tpb->data1;
683 + data2 = tpb->data2;
684 + inode = tpb->inode;
685 + dotdot_real_len = 0;
687 de->inode = cpu_to_le32(inode->i_ino);
689 - de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
691 strcpy(de->name, ".");
692 ext4_set_de_type(inode->i_sb, de, S_IFDIR);
694 + /* get packed fid data*/
695 + data1 = ext4_dentry_get_data(inode->i_sb,
696 + (struct ext4_dentry_param *) data1);
699 + memcpy(&de->name[2], data1, *(char *) data1);
700 + de->file_type |= EXT4_DIRENT_LUFID;
702 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
703 + dot_reclen = cpu_to_le16(de->rec_len);
704 de = ext4_next_entry(de, blocksize);
705 de->inode = cpu_to_le32(parent_ino);
707 + strcpy(de->name, "..");
708 + ext4_set_de_type(inode->i_sb, de, S_IFDIR);
709 + data2 = ext4_dentry_get_data(inode->i_sb,
710 + (struct ext4_dentry_param *) data2);
713 + memcpy(&de->name[3], data2, *(char *) data2);
714 + de->file_type |= EXT4_DIRENT_LUFID;
716 if (!dotdot_real_len)
717 de->rec_len = ext4_rec_len_to_disk(blocksize -
718 - (csum_size + EXT4_DIR_REC_LEN(1)),
719 + (csum_size + dot_reclen),
722 de->rec_len = ext4_rec_len_to_disk(
723 - EXT4_DIR_REC_LEN(de->name_len), blocksize);
724 - strcpy(de->name, "..");
725 - ext4_set_de_type(inode->i_sb, de, S_IFDIR);
726 + EXT4_DIR_REC_LEN(de), blocksize);
728 return ext4_next_entry(de, blocksize);
731 static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
732 - struct inode *inode)
733 + struct inode *inode,
734 + const void *data1, const void *data2)
736 + struct tp_block param;
737 struct buffer_head *dir_block = NULL;
738 struct ext4_dir_entry_2 *de;
739 struct ext4_dir_entry_tail *t;
740 @@ -2716,7 +2804,11 @@ static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
741 if (IS_ERR(dir_block))
742 return PTR_ERR(dir_block);
743 de = (struct ext4_dir_entry_2 *)dir_block->b_data;
744 - ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
745 + param.inode = inode;
746 + param.data1 = (void *)data1;
747 + param.data2 = (void *)data2;
748 + ext4_init_dot_dotdot((struct inode *)(¶m), de, blocksize,
749 + csum_size, dir->i_ino, 10);
752 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
753 @@ -2733,6 +2825,29 @@ out:
757 +/* Initialize @inode as a subdirectory of @dir, and add the
758 + * "." and ".." entries into the first directory block. */
759 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
760 + struct inode *inode,
761 + const void *data1, const void *data2)
765 + if (IS_ERR(handle))
766 + return PTR_ERR(handle);
768 + if (IS_DIRSYNC(dir))
769 + ext4_handle_sync(handle);
771 + inode->i_op = &ext4_dir_inode_operations;
772 + inode->i_fop = &ext4_dir_operations;
773 + rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
775 + rc = ext4_mark_inode_dirty(handle, inode);
778 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
780 static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
783 @@ -2759,7 +2874,7 @@ retry:
785 inode->i_op = &ext4_dir_inode_operations;
786 inode->i_fop = &ext4_dir_operations;
787 - err = ext4_init_new_dir(handle, dir, inode);
788 + err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
790 goto out_clear_inode;
791 err = ext4_mark_inode_dirty(handle, inode);
792 @@ -2811,7 +2926,7 @@ int ext4_empty_dir(struct inode *inode)
796 - if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
797 + if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
798 EXT4_ERROR_INODE(inode, "invalid size");
801 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
802 index 7715539..f48b36e 100644
803 --- a/fs/ext4/super.c
804 +++ b/fs/ext4/super.c
805 @@ -1159,7 +1159,7 @@ enum {
806 Opt_data_err_abort, Opt_data_err_ignore, Opt_test_dummy_encryption,
807 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
808 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
809 - Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
810 + Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
811 Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
812 Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
813 Opt_lazytime, Opt_nolazytime,
814 @@ -1230,6 +1230,7 @@ static const match_table_t tokens = {
815 {Opt_lazytime, "lazytime"},
816 {Opt_nolazytime, "nolazytime"},
817 {Opt_nodelalloc, "nodelalloc"},
818 + {Opt_dirdata, "dirdata"},
819 {Opt_removed, "mblk_io_submit"},
820 {Opt_removed, "nomblk_io_submit"},
821 {Opt_block_validity, "block_validity"},
822 @@ -1444,6 +1445,7 @@ static const struct mount_opts {
823 {Opt_usrjquota, 0, MOPT_Q},
824 {Opt_grpjquota, 0, MOPT_Q},
825 {Opt_offusrjquota, 0, MOPT_Q},
826 + {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
827 {Opt_offgrpjquota, 0, MOPT_Q},
828 {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
829 {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},