1 this patch implements feature which allows ext4 fs users (e.g. Lustre)
2 to store data in ext4 dirent.
3 data is stored in ext4 dirent after file-name, this space is accounted
4 in de->rec_len. flag EXT4_DIRENT_LUFID added to d_type if extra data
7 make use of dentry->d_fsdata to pass fid to ext4. so no
8 changes in ext4_add_entry() interface required.
10 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/dir.c
11 ===================================================================
12 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/dir.c
13 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/dir.c
14 @@ -71,11 +71,11 @@ int __ext4_check_dir_entry(const char *f
15 const int rlen = ext4_rec_len_from_disk(de->rec_len,
16 dir->i_sb->s_blocksize);
18 - if (unlikely(rlen < EXT4_DIR_REC_LEN(1)))
19 + if (unlikely(rlen < __EXT4_DIR_REC_LEN(1)))
20 error_msg = "rec_len is smaller than minimal";
21 else if (unlikely(rlen % 4 != 0))
22 error_msg = "rec_len % 4 != 0";
23 - else if (unlikely(rlen < EXT4_DIR_REC_LEN(de->name_len)))
24 + else if (unlikely(rlen < EXT4_DIR_REC_LEN(de)))
25 error_msg = "rec_len is too small for name_len";
26 else if (unlikely(((char *) de - buf) + rlen > size))
27 error_msg = "directory entry across range";
28 @@ -208,7 +208,7 @@ revalidate:
29 * failure will be detected in the
30 * dirent test below. */
31 if (ext4_rec_len_from_disk(de->rec_len,
32 - sb->s_blocksize) < EXT4_DIR_REC_LEN(1))
33 + sb->s_blocksize) < __EXT4_DIR_REC_LEN(1))
35 i += ext4_rec_len_from_disk(de->rec_len,
37 @@ -438,12 +438,17 @@ int ext4_htree_store_dirent(struct file
38 struct fname *fname, *new_fn;
39 struct dir_private_info *info;
43 info = dir_file->private_data;
44 p = &info->root.rb_node;
46 /* Create and allocate the fname structure */
47 - len = sizeof(struct fname) + ent_name->len + 1;
48 + if (dirent->file_type & EXT4_DIRENT_LUFID)
49 + extra_data = ext4_get_dirent_data_len(dirent);
51 + len = sizeof(struct fname) + ent_name->len + extra_data + 1;
53 new_fn = kzalloc(len, GFP_KERNEL);
56 @@ -452,7 +457,7 @@ int ext4_htree_store_dirent(struct file
57 new_fn->inode = le32_to_cpu(dirent->inode);
58 new_fn->name_len = dirent->name_len;
59 new_fn->file_type = dirent->file_type;
60 - memcpy(new_fn->name, ent_name->name, ent_name->len);
61 + memcpy(new_fn->name, ent_name->name, ent_name->len + extra_data);
62 new_fn->name[ent_name->len] = 0;
65 @@ -652,7 +457,7 @@ int ext4_htree_store_dirent(struct file
66 if (ldiskfs_check_dir_entry(dir, NULL, de, bh,
67 buf, buf_size, offset))
69 - nlen = EXT4_DIR_REC_LEN(de->name_len);
70 + nlen = EXT4_DIR_REC_LEN(de);
71 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
72 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
74 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/ext4.h
75 ===================================================================
76 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/ext4.h
77 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/ext4.h
78 @@ -952,6 +952,7 @@ struct ext4_inode_info {
79 #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
80 #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
81 #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
82 +#define EXT4_MOUNT_DIRDATA 0x40000 /* Data in directory entries*/
83 #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
84 #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
85 #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
86 @@ -1534,6 +1535,7 @@ static inline void ext4_clear_state_flag
87 EXT4_FEATURE_INCOMPAT_64BIT| \
88 EXT4_FEATURE_INCOMPAT_FLEX_BG| \
89 EXT4_FEATURE_INCOMPAT_MMP | \
90 + EXT4_FEATURE_INCOMPAT_DIRDATA| \
91 EXT4_FEATURE_INCOMPAT_INLINE_DATA | \
92 EXT4_FEATURE_INCOMPAT_ENCRYPT | \
93 EXT4_FEATURE_INCOMPAT_CSUM_SEED)
94 @@ -1640,6 +1642,43 @@ struct ext4_dir_entry_tail {
95 #define EXT4_FT_SYMLINK 7
98 +#define EXT4_FT_MASK 0xf
100 +#if EXT4_FT_MAX > EXT4_FT_MASK
101 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
105 + * d_type has 4 unused bits, so it can hold four types data. these different
106 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
107 + * stored, in flag order, after file-name in ext4 dirent.
110 + * this flag is added to d_type if ext4 dirent has extra data after
111 + * filename. this data length is variable and length is stored in first byte
112 + * of data. data start after filename NUL byte.
113 + * This is used by Lustre FS.
115 +#define EXT4_DIRENT_LUFID 0x10
117 +#define EXT4_LUFID_MAGIC 0xAD200907UL
118 +struct ext4_dentry_param {
119 + __u32 edp_magic; /* EXT4_LUFID_MAGIC */
120 + char edp_len; /* size of edp_data in bytes */
121 + char edp_data[0]; /* packed array of data */
124 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
125 + struct ext4_dentry_param *p)
128 + if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_DIRDATA))
130 + if (p && p->edp_magic == EXT4_LUFID_MAGIC)
131 + return &p->edp_len;
136 #define EXT4_FT_DIR_CSUM 0xDE
138 @@ -1650,8 +1689,11 @@ struct ext4_dir_entry_tail {
140 #define EXT4_DIR_PAD 4
141 #define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
142 -#define EXT4_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT4_DIR_ROUND) & \
143 +#define __EXT4_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT4_DIR_ROUND) & \
145 +#define EXT4_DIR_REC_LEN(de) (__EXT4_DIR_REC_LEN((de)->name_len +\
146 + ext4_get_dirent_data_len(de)))
148 #define EXT4_MAX_REC_LEN ((1<<16)-1)
151 @@ -1987,12 +2029,12 @@ extern int ext4_find_dest_de(struct inod
152 struct buffer_head *bh,
153 void *buf, int buf_size,
154 struct ext4_filename *fname,
155 - struct ext4_dir_entry_2 **dest_de);
156 + struct ext4_dir_entry_2 **dest_de, int *dlen);
157 int ext4_insert_dentry(struct inode *dir,
159 struct ext4_dir_entry_2 *de,
161 - struct ext4_filename *fname);
162 + struct ext4_filename *fname, void *data);
163 static inline void ext4_update_dx_flag(struct inode *inode)
165 if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
166 @@ -2004,10 +2046,17 @@ static unsigned char ext4_filetype_table
168 static inline unsigned char get_dtype(struct super_block *sb, int filetype)
170 + int fl_index = filetype & EXT4_FT_MASK;
172 - if (!ext4_has_feature_filetype(sb) || filetype >= EXT4_FT_MAX)
173 + if (!ext4_has_feature_filetype(sb) || fl_index >= EXT4_FT_MAX)
176 - return ext4_filetype_table[filetype];
177 + if (!test_opt(sb, DIRDATA))
178 + return ext4_filetype_table[fl_index];
180 + return (ext4_filetype_table[fl_index]) |
181 + (filetype & EXT4_DIRENT_LUFID);
186 @@ -2157,6 +2206,8 @@ extern struct buffer_head * ext4_find_en
187 extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
188 struct ext4_dir_entry_2 *de_del,
189 struct buffer_head *bh);
190 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
191 + struct inode *inode, const void *, const void *);
192 extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
193 __u32 start_minor_hash, __u32 *next_hash);
194 extern int ext4_search_dir(struct buffer_head *bh,
195 @@ -2761,6 +2810,36 @@ extern struct mutex ext4__aio_mutex[EXT4
196 extern int ext4_resize_begin(struct super_block *sb);
197 extern void ext4_resize_end(struct super_block *sb);
200 + * Compute the total directory entry data length.
201 + * This includes the filename and an implicit NUL terminator (always present),
202 + * and optional extensions. Each extension has a bit set in the high 4 bits of
203 + * de->file_type, and the extension length is the first byte in each entry.
205 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
207 + char *len = de->name + de->name_len + 1 /* NUL terminator */;
209 + __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
210 + struct ext4_dir_entry_tail *t = (struct ext4_dir_entry_tail *)de;
212 + if (!t->det_reserved_zero1 &&
213 + le16_to_cpu(t->det_rec_len) ==
214 + sizeof(struct ext4_dir_entry_tail) &&
215 + !t->det_reserved_zero2 &&
216 + t->det_reserved_ft == EXT4_FT_DIR_CSUM)
219 + while (extra_data_flags) {
220 + if (extra_data_flags & 1) {
221 + dlen += *len + (dlen == 0);
224 + extra_data_flags >>= 1;
229 #endif /* __KERNEL__ */
232 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/namei.c
233 ===================================================================
234 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/namei.c
235 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/namei.c
236 @@ -241,7 +241,8 @@ static unsigned dx_get_count(struct dx_e
237 static unsigned dx_get_limit(struct dx_entry *entries);
238 static void dx_set_count(struct dx_entry *entries, unsigned value);
239 static void dx_set_limit(struct dx_entry *entries, unsigned value);
240 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
241 +static inline unsigned dx_root_limit(struct inode *dir,
242 + struct ext4_dir_entry_2 *dot_de, unsigned infosize);
243 static unsigned dx_node_limit(struct inode *dir);
244 static struct dx_frame *dx_probe(struct ext4_filename *fname,
246 @@ -383,22 +384,23 @@ static struct dx_countlimit *get_dx_coun
248 struct ext4_dir_entry *dp;
249 struct dx_root_info *root;
251 + int count_offset, dot_rec_len, dotdot_rec_len;
253 if (le16_to_cpu(dirent->rec_len) == EXT4_BLOCK_SIZE(inode->i_sb))
255 - else if (le16_to_cpu(dirent->rec_len) == 12) {
256 - dp = (struct ext4_dir_entry *)(((void *)dirent) + 12);
258 + dot_rec_len = le16_to_cpu(dirent->rec_len);
259 + dp = (struct ext4_dir_entry *)(((void *)dirent) + dot_rec_len);
260 if (le16_to_cpu(dp->rec_len) !=
261 - EXT4_BLOCK_SIZE(inode->i_sb) - 12)
262 + EXT4_BLOCK_SIZE(inode->i_sb) - dot_rec_len)
264 - root = (struct dx_root_info *)(((void *)dp + 12));
265 + dotdot_rec_len = EXT4_DIR_REC_LEN((struct ext4_dir_entry_2 *)dp);
266 + root = (struct dx_root_info *)(((void *)dp + dotdot_rec_len));
267 if (root->reserved_zero ||
268 root->info_length != sizeof(struct dx_root_info))
273 + count_offset = 8 + dot_rec_len + dotdot_rec_len;
277 *offset = count_offset;
278 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2
280 struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
282 + BUG_ON(de->name_len != 1);
283 /* get dotdot first */
284 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
285 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
287 /* dx root info is after dotdot entry */
288 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
289 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
291 return (struct dx_root_info *)de;
293 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct d
294 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
297 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
298 +static inline unsigned dx_root_limit(struct inode *dir,
299 + struct ext4_dir_entry_2 *dot_de, unsigned infosize)
301 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
302 - EXT4_DIR_REC_LEN(2) - infosize;
303 + struct ext4_dir_entry_2 *dotdot_de;
304 + unsigned entry_space;
306 + BUG_ON(dot_de->name_len != 1);
307 + dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
308 + entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
309 + EXT4_DIR_REC_LEN(dotdot_de) - infosize;
311 if (ext4_has_metadata_csum(dir->i_sb))
312 entry_space -= sizeof(struct dx_tail);
313 @@ -565,7 +573,7 @@ static inline unsigned dx_root_limit(str
315 static inline unsigned dx_node_limit(struct inode *dir)
317 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
318 + unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
320 if (ext4_has_metadata_csum(dir->i_sb))
321 entry_space -= sizeof(struct dx_tail);
322 @@ -674,7 +682,7 @@ static struct stats dx_show_leaf(struct
323 (unsigned) ((char *) de - base));
326 - space += EXT4_DIR_REC_LEN(de->name_len);
327 + space += EXT4_DIR_REC_LEN(de);
330 de = ext4_next_entry(de, size);
331 @@ -775,11 +783,14 @@ dx_probe(struct ext4_filename *fname, st
333 entries = (struct dx_entry *)(((char *)info) + info->info_length);
335 - if (dx_get_limit(entries) != dx_root_limit(dir,
336 - info->info_length)) {
337 + if (dx_get_limit(entries) !=
338 + dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
339 + info->info_length)) {
340 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
341 dx_get_limit(entries),
342 - dx_root_limit(dir, info->info_length));
344 + (struct ext4_dir_entry_2 *)frame->bh->b_data,
345 + info->info_length));
349 @@ -963,7 +974,7 @@ static int htree_dirblock_to_tree(struct
350 de = (struct ext4_dir_entry_2 *) bh->b_data;
351 top = (struct ext4_dir_entry_2 *) ((char *) de +
352 dir->i_sb->s_blocksize -
353 - EXT4_DIR_REC_LEN(0));
354 + __EXT4_DIR_REC_LEN(0));
355 #ifdef CONFIG_EXT4_FS_ENCRYPTION
356 /* Check if the directory is encrypted */
357 if (ext4_encrypted_inode(dir)) {
358 @@ -1688,7 +1699,7 @@ dx_move_dirents(char *from, char *to, st
360 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
361 (from + (map->offs<<2));
362 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
363 + rec_len = EXT4_DIR_REC_LEN(de);
364 memcpy (to, de, rec_len);
365 ((struct ext4_dir_entry_2 *) to)->rec_len =
366 ext4_rec_len_to_disk(rec_len, blocksize);
367 @@ -1712,7 +1723,7 @@ static struct ext4_dir_entry_2* dx_pack_
368 while ((char*)de < base + blocksize) {
369 next = ext4_next_entry(de, blocksize);
370 if (de->inode && de->name_len) {
371 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
372 + rec_len = EXT4_DIR_REC_LEN(de);
374 memmove(to, de, rec_len);
375 to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
376 @@ -1843,15 +1854,17 @@ int ext4_find_dest_de(struct inode *dir,
377 struct buffer_head *bh,
378 void *buf, int buf_size,
379 struct ext4_filename *fname,
380 - struct ext4_dir_entry_2 **dest_de)
381 + struct ext4_dir_entry_2 **dest_de, int *dlen)
383 struct ext4_dir_entry_2 *de;
384 - unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
385 + unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
386 + (dlen ? *dlen : 0);
388 unsigned int offset = 0;
392 + dlen ? *dlen = 0 : 0; /* default set to 0 */
393 de = (struct ext4_dir_entry_2 *)buf;
394 top = buf + buf_size - reclen;
395 while ((char *) de <= top) {
396 @@ -1868,10 +1881,26 @@ int ext4_find_dest_de(struct inode *dir,
400 - nlen = EXT4_DIR_REC_LEN(de->name_len);
401 + nlen = EXT4_DIR_REC_LEN(de);
402 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
403 if ((de->inode ? rlen - nlen : rlen) >= reclen)
405 + /* Then for dotdot entries, check for the smaller space
406 + * required for just the entry, no FID */
407 + if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
408 + if ((de->inode ? rlen - nlen : rlen) >=
409 + __EXT4_DIR_REC_LEN(fname_len(fname))) {
410 + /* set dlen=1 to indicate not
411 + * enough space store fid */
412 + dlen ? *dlen = 1 : 0;
415 + /* The new ".." entry must be written over the
416 + * previous ".." entry, which is the first
417 + * entry traversed by this scan. If it doesn't
418 + * fit, something is badly wrong, so -EIO. */
421 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
424 @@ -1890,12 +1919,12 @@ int ext4_insert_dentry(struct inode *dir
426 struct ext4_dir_entry_2 *de,
428 - struct ext4_filename *fname)
429 + struct ext4_filename *fname, void *data)
434 - nlen = EXT4_DIR_REC_LEN(de->name_len);
435 + nlen = EXT4_DIR_REC_LEN(de);
436 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
438 struct ext4_dir_entry_2 *de1 =
439 @@ -1909,6 +1938,11 @@ int ext4_insert_dentry(struct inode *dir
440 ext4_set_de_type(inode->i_sb, de, inode->i_mode);
441 de->name_len = fname_len(fname);
442 memcpy(de->name, fname_name(fname), fname_len(fname));
444 + de->name[fname_len(fname)] = 0;
445 + memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
446 + de->file_type |= EXT4_DIRENT_LUFID;
451 @@ -1923,18 +1957,23 @@ int ext4_insert_dentry(struct inode *dir
452 static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
454 struct inode *inode, struct ext4_dir_entry_2 *de,
455 - struct buffer_head *bh)
456 + struct buffer_head *bh, struct dentry *dentry)
458 unsigned int blocksize = dir->i_sb->s_blocksize;
462 + unsigned char *data;
464 + data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
466 if (ext4_has_metadata_csum(inode->i_sb))
467 csum_size = sizeof(struct ext4_dir_entry_tail);
471 + dlen = (*data) + 1;
472 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
473 - blocksize - csum_size, fname, &de);
474 + blocksize - csum_size, fname, &de, &dlen);
478 @@ -1947,7 +1986,10 @@ static int add_dirent_to_buf(handle_t *h
480 /* By now the buffer is marked for journaling. Due to crypto operations,
481 * the following function call may fail */
482 - err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
483 + /* If writing the short form of "dotdot", don't add the data section */
486 + err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
490 @@ -2059,7 +2101,8 @@ static int make_indexed_dir(handle_t *ha
492 dx_set_block(entries, 1);
493 dx_set_count(entries, 1);
494 - dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
495 + dx_set_limit(entries, dx_root_limit(dir,
496 + dot_de, sizeof(*dx_info)));
498 /* Initialize as for dx_probe */
499 fname->hinfo.hash_version = dx_info->hash_version;
500 @@ -2087,7 +2130,7 @@ static int make_indexed_dir(handle_t *ha
504 - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
505 + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
508 * Even if the block split failed, we have to properly write
509 @@ -2109,6 +2152,8 @@ static int ext4_update_dotdot(handle_t *
510 struct buffer_head *dir_block;
511 struct ext4_dir_entry_2 *de;
512 int len, journal = 0, err = 0;
517 return PTR_ERR(handle);
518 @@ -2126,19 +2171,24 @@ static int ext4_update_dotdot(handle_t *
519 /* the first item must be "." */
520 assert(de->name_len == 1 && de->name[0] == '.');
521 len = le16_to_cpu(de->rec_len);
522 - assert(len >= EXT4_DIR_REC_LEN(1));
523 - if (len > EXT4_DIR_REC_LEN(1)) {
524 + assert(len >= __EXT4_DIR_REC_LEN(1));
525 + if (len > __EXT4_DIR_REC_LEN(1)) {
526 BUFFER_TRACE(dir_block, "get_write_access");
527 err = ext4_journal_get_write_access(handle, dir_block);
532 - de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
533 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
536 - len -= EXT4_DIR_REC_LEN(1);
537 - assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
538 + len -= EXT4_DIR_REC_LEN(de);
539 + data = ext4_dentry_get_data(dir->i_sb,
540 + (struct ext4_dentry_param *)dentry->d_fsdata);
543 + assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
545 de = (struct ext4_dir_entry_2 *)
546 ((char *) de + le16_to_cpu(de->rec_len));
548 @@ -2152,10 +2202,15 @@ static int ext4_update_dotdot(handle_t *
550 de->rec_len = cpu_to_le16(len);
552 - assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
553 + assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
555 strcpy(de->name, "..");
556 - ext4_set_de_type(dir->i_sb, de, S_IFDIR);
557 + if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
559 + memcpy(&de->name[2 + 1], data, *data);
560 + ext4_set_de_type(dir->i_sb, de, S_IFDIR);
561 + de->file_type |= EXT4_DIRENT_LUFID;
566 @@ -2237,7 +2292,7 @@ static int ext4_add_entry(handle_t *hand
569 retval = add_dirent_to_buf(handle, &fname, dir, inode,
572 if (retval != -ENOSPC)
575 @@ -2265,7 +2320,7 @@ static int ext4_add_entry(handle_t *hand
576 initialize_dirent_tail(t, blocksize);
579 - retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
580 + retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
582 ext4_fname_free_filename(&fname);
584 @@ -2305,7 +2360,7 @@ static int ext4_dx_add_entry(handle_t *h
588 - err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
589 + err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
593 @@ -2409,7 +2464,7 @@ static int ext4_dx_add_entry(handle_t *h
597 - err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
598 + err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
602 @@ -2683,37 +2738,70 @@ err_unlock_inode:
607 + struct inode *inode;
612 struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
613 struct ext4_dir_entry_2 *de,
614 int blocksize, int csum_size,
615 unsigned int parent_ino, int dotdot_real_len)
617 + void *data1 = NULL, *data2 = NULL;
618 + int dot_reclen = 0;
620 + if (dotdot_real_len == 10) {
621 + struct tp_block *tpb = (struct tp_block *)inode;
622 + data1 = tpb->data1;
623 + data2 = tpb->data2;
624 + inode = tpb->inode;
625 + dotdot_real_len = 0;
627 de->inode = cpu_to_le32(inode->i_ino);
629 - de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
631 strcpy(de->name, ".");
632 ext4_set_de_type(inode->i_sb, de, S_IFDIR);
634 + /* get packed fid data*/
635 + data1 = ext4_dentry_get_data(inode->i_sb,
636 + (struct ext4_dentry_param *) data1);
639 + memcpy(&de->name[2], data1, *(char *) data1);
640 + de->file_type |= EXT4_DIRENT_LUFID;
642 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
643 + dot_reclen = cpu_to_le16(de->rec_len);
644 de = ext4_next_entry(de, blocksize);
645 de->inode = cpu_to_le32(parent_ino);
647 + strcpy(de->name, "..");
648 + ext4_set_de_type(inode->i_sb, de, S_IFDIR);
649 + data2 = ext4_dentry_get_data(inode->i_sb,
650 + (struct ext4_dentry_param *) data2);
653 + memcpy(&de->name[3], data2, *(char *) data2);
654 + de->file_type |= EXT4_DIRENT_LUFID;
656 if (!dotdot_real_len)
657 de->rec_len = ext4_rec_len_to_disk(blocksize -
658 - (csum_size + EXT4_DIR_REC_LEN(1)),
659 + (csum_size + dot_reclen),
662 de->rec_len = ext4_rec_len_to_disk(
663 - EXT4_DIR_REC_LEN(de->name_len), blocksize);
664 - strcpy(de->name, "..");
665 - ext4_set_de_type(inode->i_sb, de, S_IFDIR);
666 + EXT4_DIR_REC_LEN(de), blocksize);
668 return ext4_next_entry(de, blocksize);
671 static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
672 - struct inode *inode)
673 + struct inode *inode,
674 + const void *data1, const void *data2)
676 + struct tp_block param;
677 struct buffer_head *dir_block = NULL;
678 struct ext4_dir_entry_2 *de;
679 struct ext4_dir_entry_tail *t;
680 @@ -2738,7 +2826,11 @@ static int ext4_init_new_dir(handle_t *h
681 if (IS_ERR(dir_block))
682 return PTR_ERR(dir_block);
683 de = (struct ext4_dir_entry_2 *)dir_block->b_data;
684 - ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
685 + param.inode = inode;
686 + param.data1 = (void *)data1;
687 + param.data2 = (void *)data2;
688 + ext4_init_dot_dotdot((struct inode *)(¶m), de, blocksize,
689 + csum_size, dir->i_ino, 10);
692 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
693 @@ -2755,6 +2847,29 @@ out:
697 +/* Initialize @inode as a subdirectory of @dir, and add the
698 + * "." and ".." entries into the first directory block. */
699 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
700 + struct inode *inode,
701 + const void *data1, const void *data2)
705 + if (IS_ERR(handle))
706 + return PTR_ERR(handle);
708 + if (IS_DIRSYNC(dir))
709 + ext4_handle_sync(handle);
711 + inode->i_op = &ext4_dir_inode_operations;
712 + inode->i_fop = &ext4_dir_operations;
713 + rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
715 + rc = ext4_mark_inode_dirty(handle, inode);
718 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
720 static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
723 @@ -2781,7 +2896,7 @@ retry:
725 inode->i_op = &ext4_dir_inode_operations;
726 inode->i_fop = &ext4_dir_operations;
727 - err = ext4_init_new_dir(handle, dir, inode);
728 + err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
730 goto out_clear_inode;
731 err = ext4_mark_inode_dirty(handle, inode);
732 @@ -2832,7 +2947,7 @@ int ext4_empty_dir(struct inode *inode)
736 - if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
737 + if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
738 EXT4_ERROR_INODE(inode, "invalid size");
741 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
742 ===================================================================
743 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/inline.c
744 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
745 @@ -988,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
748 err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
749 - inline_size, fname, &de);
750 + inline_size, fname, &de, NULL);
754 @@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
755 err = ext4_journal_get_write_access(handle, iloc->bh);
758 - ext4_insert_dentry(dir, inode, de, inline_size, fname);
759 + ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
761 ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
763 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
764 int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
765 int new_size = get_max_inline_xattr_value_size(dir, iloc);
767 - if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
768 + if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
771 ret = ext4_update_inline_data(handle, dir,
772 @@ -1348,7 +1348,7 @@ int htree_inlinedir_to_tree(struct file
774 strcpy(fake.name, ".");
775 fake.rec_len = ext4_rec_len_to_disk(
776 - EXT4_DIR_REC_LEN(fake.name_len),
777 + EXT4_DIR_REC_LEN(&fake),
779 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
781 @@ -1358,7 +1358,7 @@ int htree_inlinedir_to_tree(struct file
783 strcpy(fake.name, "..");
784 fake.rec_len = ext4_rec_len_to_disk(
785 - EXT4_DIR_REC_LEN(fake.name_len),
786 + EXT4_DIR_REC_LEN(&fake),
788 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
790 @@ -1455,8 +1455,8 @@ int ext4_read_inline_dir(struct file *fi
791 * So we will use extra_offset and extra_size to indicate them
792 * during the inline dir iteration.
794 - dotdot_offset = EXT4_DIR_REC_LEN(1);
795 - dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
796 + dotdot_offset = __EXT4_DIR_REC_LEN(1);
797 + dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
798 extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
799 extra_size = extra_offset + inline_size;
801 @@ -1493,7 +1493,7 @@ revalidate:
802 * failure will be detected in the
803 * dirent test below. */
804 if (ext4_rec_len_from_disk(de->rec_len, extra_size)
805 - < EXT4_DIR_REC_LEN(1))
806 + < __EXT4_DIR_REC_LEN(1))
808 i += ext4_rec_len_from_disk(de->rec_len,
810 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
811 ===================================================================
812 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/super.c
813 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
814 @@ -1151,7 +1151,7 @@ enum {
815 Opt_data_err_abort, Opt_data_err_ignore,
816 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
817 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
818 - Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
819 + Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
820 Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
821 Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
822 Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
823 @@ -1216,6 +1216,7 @@ static const match_table_t tokens = {
824 {Opt_stripe, "stripe=%u"},
825 {Opt_delalloc, "delalloc"},
826 {Opt_nodelalloc, "nodelalloc"},
827 + {Opt_dirdata, "dirdata"},
828 {Opt_removed, "mblk_io_submit"},
829 {Opt_removed, "nomblk_io_submit"},
830 {Opt_block_validity, "block_validity"},
831 @@ -1424,6 +1425,7 @@ static const struct mount_opts {
832 {Opt_usrjquota, 0, MOPT_Q},
833 {Opt_grpjquota, 0, MOPT_Q},
834 {Opt_offusrjquota, 0, MOPT_Q},
835 + {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
836 {Opt_offgrpjquota, 0, MOPT_Q},
837 {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
838 {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},