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,28 @@ 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;
211 + while (extra_data_flags) {
212 + if (extra_data_flags & 1) {
213 + dlen += *len + (dlen == 0);
216 + extra_data_flags >>= 1;
221 #endif /* __KERNEL__ */
224 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/namei.c
225 ===================================================================
226 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/namei.c
227 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/namei.c
228 @@ -239,7 +239,8 @@ static unsigned dx_get_count(struct dx_e
229 static unsigned dx_get_limit(struct dx_entry *entries);
230 static void dx_set_count(struct dx_entry *entries, unsigned value);
231 static void dx_set_limit(struct dx_entry *entries, unsigned value);
232 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
233 +static inline unsigned dx_root_limit(struct inode *dir,
234 + struct ext4_dir_entry_2 *dot_de, unsigned infosize);
235 static unsigned dx_node_limit(struct inode *dir);
236 static struct dx_frame *dx_probe(const struct qstr *d_name,
238 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2
240 struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
242 - /* get dotdot first */
243 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
244 + BUG_ON(de->name_len != 1);
245 + /* get dotdot first */
246 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
248 - /* dx root info is after dotdot entry */
249 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
250 + /* dx root info is after dotdot entry */
251 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
253 return (struct dx_root_info *)de;
255 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct d
256 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
259 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
260 +static inline unsigned dx_root_limit(struct inode *dir,
261 + struct ext4_dir_entry_2 *dot_de, unsigned infosize)
263 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
264 - EXT4_DIR_REC_LEN(2) - infosize;
265 + struct ext4_dir_entry_2 *dotdot_de;
266 + unsigned entry_space;
268 + BUG_ON(dot_de->name_len != 1);
269 + dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
270 + entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
271 + EXT4_DIR_REC_LEN(dotdot_de) - infosize;
273 if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
274 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
275 @@ -566,7 +574,7 @@ static inline unsigned dx_root_limit(str
277 static inline unsigned dx_node_limit(struct inode *dir)
279 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
280 + unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
282 if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
283 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
284 @@ -617,7 +625,7 @@ static struct stats dx_show_leaf(struct
285 printk(":%x.%u ", h.hash,
286 (unsigned) ((char *) de - base));
288 - space += EXT4_DIR_REC_LEN(de->name_len);
289 + space += EXT4_DIR_REC_LEN(de);
292 de = ext4_next_entry(de, size);
293 @@ -723,11 +731,14 @@ dx_probe(const struct qstr *d_name, stru
295 entries = (struct dx_entry *) (((char *)info) + info->info_length);
297 - if (dx_get_limit(entries) != dx_root_limit(dir,
298 - info->info_length)) {
299 + if (dx_get_limit(entries) !=
300 + dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
301 + info->info_length)) {
302 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
303 dx_get_limit(entries),
304 - dx_root_limit(dir, info->info_length));
306 + (struct ext4_dir_entry_2 *)frame->bh->b_data,
307 + info->info_length));
311 @@ -916,7 +925,7 @@ static int htree_dirblock_to_tree(struct
312 de = (struct ext4_dir_entry_2 *) bh->b_data;
313 top = (struct ext4_dir_entry_2 *) ((char *) de +
314 dir->i_sb->s_blocksize -
315 - EXT4_DIR_REC_LEN(0));
316 + __EXT4_DIR_REC_LEN(0));
317 #ifdef CONFIG_EXT4_FS_ENCRYPTION
318 /* Check if the directory is encrypted */
319 if (ext4_encrypted_inode(dir)) {
320 @@ -1508,7 +1517,7 @@ dx_move_dirents(char *from, char *to, st
322 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
323 (from + (map->offs<<2));
324 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
325 + rec_len = EXT4_DIR_REC_LEN(de);
326 memcpy (to, de, rec_len);
327 ((struct ext4_dir_entry_2 *) to)->rec_len =
328 ext4_rec_len_to_disk(rec_len, blocksize);
329 @@ -1532,7 +1541,7 @@ static struct ext4_dir_entry_2* dx_pack_
330 while ((char*)de < base + blocksize) {
331 next = ext4_next_entry(de, blocksize);
332 if (de->inode && de->name_len) {
333 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
334 + rec_len = EXT4_DIR_REC_LEN(de);
336 memmove(to, de, rec_len);
337 to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
338 @@ -1664,15 +1673,17 @@ int ext4_find_dest_de(struct inode *dir,
339 struct buffer_head *bh,
340 void *buf, int buf_size,
341 struct ext4_filename *fname,
342 - struct ext4_dir_entry_2 **dest_de)
343 + struct ext4_dir_entry_2 **dest_de, int *dlen)
345 struct ext4_dir_entry_2 *de;
346 - unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
347 + unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
348 + (dlen ? *dlen : 0);
350 unsigned int offset = 0;
354 + dlen ? *dlen = 0 : 0; /* default set to 0 */
355 de = (struct ext4_dir_entry_2 *)buf;
356 top = buf + buf_size - reclen;
357 while ((char *) de <= top) {
358 @@ -1680,10 +1690,26 @@ int ext4_find_dest_de(struct inode *dir,
362 - nlen = EXT4_DIR_REC_LEN(de->name_len);
363 + nlen = EXT4_DIR_REC_LEN(de);
364 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
365 if ((de->inode ? rlen - nlen : rlen) >= reclen)
367 + /* Then for dotdot entries, check for the smaller space
368 + * required for just the entry, no FID */
369 + if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
370 + if ((de->inode ? rlen - nlen : rlen) >=
371 + __EXT4_DIR_REC_LEN(fname_len(fname))) {
372 + /* set dlen=1 to indicate not
373 + * enough space store fid */
374 + dlen ? *dlen = 1 : 0;
377 + /* The new ".." entry must be written over the
378 + * previous ".." entry, which is the first
379 + * entry traversed by this scan. If it doesn't
380 + * fit, something is badly wrong, so -EIO. */
383 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
386 @@ -1697,12 +1723,12 @@ int ext4_find_dest_de(struct inode *dir,
387 void ext4_insert_dentry(struct inode *inode,
388 struct ext4_dir_entry_2 *de,
390 - struct ext4_filename *fname)
391 + struct ext4_filename *fname, void *data)
396 - nlen = EXT4_DIR_REC_LEN(de->name_len);
397 + nlen = EXT4_DIR_REC_LEN(de);
398 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
400 struct ext4_dir_entry_2 *de1 =
401 @@ -1716,6 +1742,11 @@ void ext4_insert_dentry(struct inode *in
402 ext4_set_de_type(inode->i_sb, de, inode->i_mode);
403 de->name_len = fname_len(fname);
404 memcpy(de->name, fname_name(fname), fname_len(fname));
406 + de->name[fname_len(fname)] = 0;
407 + memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
408 + de->file_type |= EXT4_DIRENT_LUFID;
413 @@ -1734,18 +1765,23 @@ static int add_dirent_to_buf(handle_t *h
414 static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
416 struct inode *inode, struct ext4_dir_entry_2 *de,
417 - struct buffer_head *bh)
418 + struct buffer_head *bh, struct dentry *dentry)
420 unsigned int blocksize = dir->i_sb->s_blocksize;
424 + unsigned char *data;
426 + data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
428 if (ext4_has_metadata_csum(inode->i_sb))
429 csum_size = sizeof(struct ext4_dir_entry_tail);
433 + dlen = (*data) + 1;
434 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
435 - blocksize - csum_size, fname, &de);
436 + blocksize - csum_size, fname, &de, &dlen);
440 @@ -1755,7 +1791,10 @@ static int add_dirent_to_buf(handle_t *h
442 /* By now the buffer is marked for journaling. Due to crypto operations,
443 * the following function call may fail */
444 - err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
445 + /* If writing the short form of "dotdot", don't add the data section */
448 + err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
452 @@ -1866,7 +1905,8 @@ static int make_indexed_dir(handle_t *ha
454 dx_set_block(entries, 1);
455 dx_set_count(entries, 1);
456 - dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
457 + dx_set_limit(entries, dx_root_limit(dir,
458 + dot_de, sizeof(*dx_info)));
460 /* Initialize as for dx_probe */
461 hinfo.hash_version = dx_info->hash_version;
462 @@ -1876,14 +2476,14 @@ static int make_indexed_dir(handle_t *ha
465 - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
466 + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
469 * Even if the block split failed, we have to properly write
470 * out all the changes we did so far. Otherwise we can end up
471 * with corrupted filesystem.
474 ext4_mark_inode_dirty(handle, dir);
478 @@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
479 struct buffer_head * dir_block;
480 struct ext4_dir_entry_2 * de;
481 int len, journal = 0, err = 0;
486 return PTR_ERR(handle);
487 @@ -1924,19 +1966,24 @@ static int ext4_update_dotdot(handle_t *
488 /* the first item must be "." */
489 assert(de->name_len == 1 && de->name[0] == '.');
490 len = le16_to_cpu(de->rec_len);
491 - assert(len >= EXT4_DIR_REC_LEN(1));
492 - if (len > EXT4_DIR_REC_LEN(1)) {
493 + assert(len >= __EXT4_DIR_REC_LEN(1));
494 + if (len > __EXT4_DIR_REC_LEN(1)) {
495 BUFFER_TRACE(dir_block, "get_write_access");
496 err = ext4_journal_get_write_access(handle, dir_block);
501 - de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
502 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
505 - len -= EXT4_DIR_REC_LEN(1);
506 - assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
507 + len -= EXT4_DIR_REC_LEN(de);
508 + data = ext4_dentry_get_data(dir->i_sb,
509 + (struct ext4_dentry_param *)dentry->d_fsdata);
512 + assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
514 de = (struct ext4_dir_entry_2 *)
515 ((char *) de + le16_to_cpu(de->rec_len));
517 @@ -1950,10 +1997,15 @@ static int ext4_update_dotdot(handle_t *
519 de->rec_len = cpu_to_le16(len);
521 - assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
522 + assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
524 strcpy(de->name, "..");
525 - ext4_set_de_type(dir->i_sb, de, S_IFDIR);
526 + if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
528 + memcpy(&de->name[2 + 1], data, *data);
529 + ext4_set_de_type(dir->i_sb, de, S_IFDIR);
530 + de->file_type |= EXT4_DIRENT_LUFID;
535 @@ -2039,7 +2639,7 @@ int __ext4_add_entry(handle_t *handle
538 retval = add_dirent_to_buf(handle, &fname, dir, inode,
541 if (retval != -ENOSPC)
544 @@ -2067,7 +2667,7 @@ int __ext4_add_entry(handle_t *handle
545 initialize_dirent_tail(t, blocksize);
548 - retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
549 + retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
551 ext4_fname_free_filename(&fname);
553 @@ -2156,7 +2756,7 @@ again:
557 - err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
558 + err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
562 @@ -2213,7 +2913,7 @@ again:
566 - err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
567 + err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
571 @@ -2428,30 +2480,61 @@ retry:
576 + struct inode *inode;
581 struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
582 struct ext4_dir_entry_2 *de,
583 int blocksize, int csum_size,
584 unsigned int parent_ino, int dotdot_real_len)
586 + void *data1 = NULL, *data2 = NULL;
587 + int dot_reclen = 0;
589 + if (dotdot_real_len == 10) {
590 + struct tp_block *tpb = (struct tp_block *)inode;
591 + data1 = tpb->data1;
592 + data2 = tpb->data2;
593 + inode = tpb->inode;
594 + dotdot_real_len = 0;
596 de->inode = cpu_to_le32(inode->i_ino);
598 - de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
600 strcpy(de->name, ".");
601 ext4_set_de_type(inode->i_sb, de, S_IFDIR);
603 + /* get packed fid data*/
604 + data1 = ext4_dentry_get_data(inode->i_sb,
605 + (struct ext4_dentry_param *) data1);
608 + memcpy(&de->name[2], data1, *(char *) data1);
609 + de->file_type |= EXT4_DIRENT_LUFID;
611 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
612 + dot_reclen = cpu_to_le16(de->rec_len);
613 de = ext4_next_entry(de, blocksize);
614 de->inode = cpu_to_le32(parent_ino);
616 + strcpy(de->name, "..");
617 + ext4_set_de_type(inode->i_sb, de, S_IFDIR);
618 + data2 = ext4_dentry_get_data(inode->i_sb,
619 + (struct ext4_dentry_param *) data2);
622 + memcpy(&de->name[3], data2, *(char *) data2);
623 + de->file_type |= EXT4_DIRENT_LUFID;
625 if (!dotdot_real_len)
626 de->rec_len = ext4_rec_len_to_disk(blocksize -
627 - (csum_size + EXT4_DIR_REC_LEN(1)),
628 + (csum_size + dot_reclen),
631 de->rec_len = ext4_rec_len_to_disk(
632 - EXT4_DIR_REC_LEN(de->name_len), blocksize);
633 + EXT4_DIR_REC_LEN(de), blocksize);
634 - strcpy(de->name, "..");
635 - ext4_set_de_type(inode->i_sb, de, S_IFDIR);
637 return ext4_next_entry(de, blocksize);
639 @@ -2457,8 +2540,10 @@ struct ext4_dir_entry_2 *ext4_init_dot_d
642 static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
643 - struct inode *inode)
644 + struct inode *inode,
645 + const void *data1, const void *data2)
647 + struct tp_block param;
648 struct buffer_head *dir_block = NULL;
649 struct ext4_dir_entry_2 *de;
650 struct ext4_dir_entry_tail *t;
651 @@ -2488,7 +2573,11 @@ static int ext4_init_new_dir(handle_t *h
654 de = (struct ext4_dir_entry_2 *)dir_block->b_data;
655 - ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
656 + param.inode = inode;
657 + param.data1 = (void *)data1;
658 + param.data2 = (void *)data2;
659 + ext4_init_dot_dotdot((struct inode *)(¶m), de, blocksize,
660 + csum_size, dir->i_ino, 10);
663 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
664 @@ -2402,6 +2426,29 @@ out:
668 +/* Initialize @inode as a subdirectory of @dir, and add the
669 + * "." and ".." entries into the first directory block. */
670 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
671 + struct inode *inode,
672 + const void *data1, const void *data2)
676 + if (IS_ERR(handle))
677 + return PTR_ERR(handle);
679 + if (IS_DIRSYNC(dir))
680 + ext4_handle_sync(handle);
682 + inode->i_op = &ext4_dir_inode_operations;
683 + inode->i_fop = &ext4_dir_operations;
684 + rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
686 + rc = ext4_mark_inode_dirty(handle, inode);
689 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
691 static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
694 @@ -2546,7 +2636,7 @@ retry:
696 inode->i_op = &ext4_dir_inode_operations;
697 inode->i_fop = &ext4_dir_operations;
698 - err = ext4_init_new_dir(handle, dir, inode);
699 + err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
701 goto out_clear_inode;
702 err = ext4_mark_inode_dirty(handle, inode);
703 @@ -2598,7 +2688,7 @@ static int empty_dir(struct inode *inode
707 - if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
708 + if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
709 EXT4_ERROR_INODE(inode, "invalid size");
712 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
713 ===================================================================
714 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/inline.c
715 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
716 @@ -988,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
719 err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
720 - inline_size, fname, &de);
721 + inline_size, fname, &de, NULL);
725 @@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
726 err = ext4_journal_get_write_access(handle, iloc->bh);
729 - ext4_insert_dentry(dir, inode, de, inline_size, fname);
730 + ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
732 ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
734 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
735 int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
736 int new_size = get_max_inline_xattr_value_size(dir, iloc);
738 - if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
739 + if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
742 ret = ext4_update_inline_data(handle, dir,
743 @@ -1348,7 +1348,7 @@ int htree_inlinedir_to_tree(struct file
745 strcpy(fake.name, ".");
746 fake.rec_len = ext4_rec_len_to_disk(
747 - EXT4_DIR_REC_LEN(fake.name_len),
748 + EXT4_DIR_REC_LEN(&fake),
750 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
752 @@ -1358,7 +1358,7 @@ int htree_inlinedir_to_tree(struct file
754 strcpy(fake.name, "..");
755 fake.rec_len = ext4_rec_len_to_disk(
756 - EXT4_DIR_REC_LEN(fake.name_len),
757 + EXT4_DIR_REC_LEN(&fake),
759 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
761 @@ -1455,8 +1455,8 @@ int ext4_read_inline_dir(struct file *fi
762 * So we will use extra_offset and extra_size to indicate them
763 * during the inline dir iteration.
765 - dotdot_offset = EXT4_DIR_REC_LEN(1);
766 - dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
767 + dotdot_offset = __EXT4_DIR_REC_LEN(1);
768 + dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
769 extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
770 extra_size = extra_offset + inline_size;
772 @@ -1493,7 +1493,7 @@ revalidate:
773 * failure will be detected in the
774 * dirent test below. */
775 if (ext4_rec_len_from_disk(de->rec_len, extra_size)
776 - < EXT4_DIR_REC_LEN(1))
777 + < __EXT4_DIR_REC_LEN(1))
779 i += ext4_rec_len_from_disk(de->rec_len,
781 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
782 ===================================================================
783 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/super.c
784 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
785 @@ -1151,7 +1151,7 @@ enum {
786 Opt_data_err_abort, Opt_data_err_ignore,
787 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
788 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
789 - Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
790 + Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
791 Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
792 Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
793 Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
794 @@ -1216,6 +1216,7 @@ static const match_table_t tokens = {
795 {Opt_stripe, "stripe=%u"},
796 {Opt_delalloc, "delalloc"},
797 {Opt_nodelalloc, "nodelalloc"},
798 + {Opt_dirdata, "dirdata"},
799 {Opt_removed, "mblk_io_submit"},
800 {Opt_removed, "nomblk_io_submit"},
801 {Opt_block_validity, "block_validity"},
802 @@ -1424,6 +1425,7 @@ static const struct mount_opts {
803 {Opt_usrjquota, 0, MOPT_Q},
804 {Opt_grpjquota, 0, MOPT_Q},
805 {Opt_offusrjquota, 0, MOPT_Q},
806 + {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
807 {Opt_offgrpjquota, 0, MOPT_Q},
808 {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
809 {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},