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) + dirent->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) + dirent->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, dirent->name, dirent->name_len);
61 + memcpy(new_fn->name, dirent->name, dirent->name_len + extra_data);
62 new_fn->name[dirent->name_len] = 0;
65 @@ -452,7 +457,7 @@ int ext4_htree_store_dirent(struct file
66 if (ext4_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_ERRORS_MASK 0x00070
80 #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */
81 #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/
82 +#define EXT4_MOUNT_DIRDATA 0x00200 /* Data in directory entries*/
83 #define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */
84 #define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */
85 #define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */
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 #define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
93 EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
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,11 +2029,11 @@ extern int ext4_find_dest_de(struct inod
152 struct buffer_head *bh,
153 void *buf, int buf_size,
154 const char *name, int namelen,
155 - struct ext4_dir_entry_2 **dest_de);
156 + struct ext4_dir_entry_2 **dest_de, int *dlen);
157 void ext4_insert_dentry(struct inode *inode,
158 struct ext4_dir_entry_2 *de,
160 - const char *name, int namelen);
161 + const char *name, int namelen, void *data);
162 static inline void ext4_update_dx_flag(struct inode *inode)
164 if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
165 @@ -2004,11 +2046,18 @@ static unsigned char ext4_filetype_table
167 static inline unsigned char get_dtype(struct super_block *sb, int filetype)
169 + int fl_index = filetype & EXT4_FT_MASK;
171 if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) ||
172 - (filetype >= EXT4_FT_MAX))
173 + (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 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 @@ -239,7 +239,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(const struct qstr *d_name,
246 @@ -379,22 +380,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 - /* get dotdot first */
283 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
284 + BUG_ON(de->name_len != 1);
285 + /* get dotdot first */
286 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
288 - /* dx root info is after dotdot entry */
289 - de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
290 + /* dx root info is after dotdot entry */
291 + de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
293 return (struct dx_root_info *)de;
295 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct d
296 ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
299 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
300 +static inline unsigned dx_root_limit(struct inode *dir,
301 + struct ext4_dir_entry_2 *dot_de, unsigned infosize)
303 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
304 - EXT4_DIR_REC_LEN(2) - infosize;
305 + struct ext4_dir_entry_2 *dotdot_de;
306 + unsigned entry_space;
308 + BUG_ON(dot_de->name_len != 1);
309 + dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
310 + entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
311 + EXT4_DIR_REC_LEN(dotdot_de) - infosize;
313 if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
314 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
315 @@ -566,7 +574,7 @@ static inline unsigned dx_root_limit(str
317 static inline unsigned dx_node_limit(struct inode *dir)
319 - unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
320 + unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
322 if (EXT4_HAS_RO_COMPAT_FEATURE(dir->i_sb,
323 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
324 @@ -617,7 +625,7 @@ static struct stats dx_show_leaf(struct
325 printk(":%x.%u ", h.hash,
326 (unsigned) ((char *) de - base));
328 - space += EXT4_DIR_REC_LEN(de->name_len);
329 + space += EXT4_DIR_REC_LEN(de);
332 de = ext4_next_entry(de, size);
333 @@ -723,12 +731,15 @@ dx_probe(const struct qstr *d_name, stru
335 entries = (struct dx_entry *) (((char *)info) + info->info_length);
337 - if (dx_get_limit(entries) != dx_root_limit(dir,
338 - info->info_length)) {
339 + if (dx_get_limit(entries) !=
340 + dx_root_limit(dir, (struct ext4_dir_entry_2 *)bh->b_data,
341 + info->info_length)) {
342 ext4_warning(dir->i_sb, "dx entry: limit != root limit "
343 "inode #%lu: dx entry: limit %u != root limit %u",
344 dir->i_ino, dx_get_limit(entries),
345 - dx_root_limit(dir, info->info_length));
347 + (struct ext4_dir_entry_2 *)bh->b_data,
348 + info->info_length));
350 *err = ERR_BAD_DX_DIR;
352 @@ -916,7 +925,7 @@ static int htree_dirblock_to_tree(struct
353 de = (struct ext4_dir_entry_2 *) bh->b_data;
354 top = (struct ext4_dir_entry_2 *) ((char *) de +
355 dir->i_sb->s_blocksize -
356 - EXT4_DIR_REC_LEN(0));
357 + __EXT4_DIR_REC_LEN(0));
358 for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
359 if (ext4_check_dir_entry(dir, NULL, de, bh,
360 bh->b_data, bh->b_size,
361 @@ -1508,7 +1517,7 @@ dx_move_dirents(char *from, char *to, st
363 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
364 (from + (map->offs<<2));
365 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
366 + rec_len = EXT4_DIR_REC_LEN(de);
367 memcpy (to, de, rec_len);
368 ((struct ext4_dir_entry_2 *) to)->rec_len =
369 ext4_rec_len_to_disk(rec_len, blocksize);
370 @@ -1532,7 +1541,7 @@ static struct ext4_dir_entry_2* dx_pack_
371 while ((char*)de < base + blocksize) {
372 next = ext4_next_entry(de, blocksize);
373 if (de->inode && de->name_len) {
374 - rec_len = EXT4_DIR_REC_LEN(de->name_len);
375 + rec_len = EXT4_DIR_REC_LEN(de);
377 memmove(to, de, rec_len);
378 to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
379 @@ -1664,14 +1673,16 @@ int ext4_find_dest_de(struct inode *dir,
380 struct buffer_head *bh,
381 void *buf, int buf_size,
382 const char *name, int namelen,
383 - struct ext4_dir_entry_2 **dest_de)
384 + struct ext4_dir_entry_2 **dest_de, int *dlen)
386 struct ext4_dir_entry_2 *de;
387 - unsigned short reclen = EXT4_DIR_REC_LEN(namelen);
388 + unsigned short reclen = __EXT4_DIR_REC_LEN(namelen) +
389 + (dlen ? *dlen : 0);
391 unsigned int offset = 0;
394 + dlen ? *dlen = 0 : 0; /* default set to 0 */
395 de = (struct ext4_dir_entry_2 *)buf;
396 top = buf + buf_size - reclen;
397 while ((char *) de <= top) {
398 @@ -1680,10 +1690,26 @@ int ext4_find_dest_de(struct inode *dir,
400 if (ext4_match(namelen, name, de))
402 - nlen = EXT4_DIR_REC_LEN(de->name_len);
403 + nlen = EXT4_DIR_REC_LEN(de);
404 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
405 if ((de->inode ? rlen - nlen : rlen) >= reclen)
407 + /* Then for dotdot entries, check for the smaller space
408 + * required for just the entry, no FID */
409 + if (namelen == 2 && memcmp(name, "..", 2) == 0) {
410 + if ((de->inode ? rlen - nlen : rlen) >=
411 + __EXT4_DIR_REC_LEN(namelen)) {
412 + /* set dlen=1 to indicate not
413 + * enough space store fid */
414 + dlen ? *dlen = 1 : 0;
417 + /* The new ".." entry must be written over the
418 + * previous ".." entry, which is the first
419 + * entry traversed by this scan. If it doesn't
420 + * fit, something is badly wrong, so -EIO. */
423 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
426 @@ -1697,12 +1723,12 @@ int ext4_find_dest_de(struct inode *dir,
427 void ext4_insert_dentry(struct inode *inode,
428 struct ext4_dir_entry_2 *de,
430 - const char *name, int namelen)
431 + const char *name, int namelen, void *data)
436 - nlen = EXT4_DIR_REC_LEN(de->name_len);
437 + nlen = EXT4_DIR_REC_LEN(de);
438 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
440 struct ext4_dir_entry_2 *de1 =
441 @@ -1716,6 +1742,11 @@ void ext4_insert_dentry(struct inode *in
442 ext4_set_de_type(inode->i_sb, de, inode->i_mode);
443 de->name_len = namelen;
444 memcpy(de->name, name, namelen);
446 + de->name[namelen] = 0;
447 + memcpy(&de->name[namelen + 1], data, *(char *)data);
448 + de->file_type |= EXT4_DIRENT_LUFID;
452 * Add a new entry into a directory (leaf) block. If de is non-NULL,
453 @@ -1734,15 +1765,20 @@ static int add_dirent_to_buf(handle_t *h
454 int namelen = dentry->d_name.len;
455 unsigned int blocksize = dir->i_sb->s_blocksize;
459 + unsigned char *data;
461 + data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
463 if (ext4_has_metadata_csum(inode->i_sb))
464 csum_size = sizeof(struct ext4_dir_entry_tail);
468 + dlen = (*data) + 1;
469 err = ext4_find_dest_de(dir, inode,
470 bh, bh->b_data, blocksize - csum_size,
471 - name, namelen, &de);
472 + name, namelen, &de, &dlen);
476 @@ -1755,7 +1791,10 @@ static int add_dirent_to_buf(handle_t *h
479 /* By now the buffer is marked for journaling */
480 - ext4_insert_dentry(inode, de, blocksize, name, namelen);
481 + /* If writing the short form of "dotdot", don't add the data section */
484 + ext4_insert_dentry(inode, de, blocksize, name, namelen, data);
487 * XXX shouldn't update any times until successful
488 @@ -1866,7 +1905,8 @@ static int make_indexed_dir(handle_t *ha
490 dx_set_block(entries, 1);
491 dx_set_count(entries, 1);
492 - dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
493 + dx_set_limit(entries, dx_root_limit(dir,
494 + dot_de, sizeof(*dx_info)));
496 /* Initialize as for dx_probe */
497 hinfo.hash_version = dx_info->hash_version;
498 @@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
499 struct buffer_head * dir_block;
500 struct ext4_dir_entry_2 * de;
501 int len, journal = 0, err = 0;
506 return PTR_ERR(handle);
507 @@ -1924,19 +1966,24 @@ static int ext4_update_dotdot(handle_t *
508 /* the first item must be "." */
509 assert(de->name_len == 1 && de->name[0] == '.');
510 len = le16_to_cpu(de->rec_len);
511 - assert(len >= EXT4_DIR_REC_LEN(1));
512 - if (len > EXT4_DIR_REC_LEN(1)) {
513 + assert(len >= __EXT4_DIR_REC_LEN(1));
514 + if (len > __EXT4_DIR_REC_LEN(1)) {
515 BUFFER_TRACE(dir_block, "get_write_access");
516 err = ext4_journal_get_write_access(handle, dir_block);
521 - de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
522 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
525 - len -= EXT4_DIR_REC_LEN(1);
526 - assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
527 + len -= EXT4_DIR_REC_LEN(de);
528 + data = ext4_dentry_get_data(dir->i_sb,
529 + (struct ext4_dentry_param *)dentry->d_fsdata);
532 + assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
534 de = (struct ext4_dir_entry_2 *)
535 ((char *) de + le16_to_cpu(de->rec_len));
537 @@ -1950,10 +1997,15 @@ static int ext4_update_dotdot(handle_t *
539 de->rec_len = cpu_to_le16(len);
541 - assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
542 + assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
544 strcpy(de->name, "..");
545 - ext4_set_de_type(dir->i_sb, de, S_IFDIR);
546 + if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
548 + memcpy(&de->name[2 + 1], data, *data);
549 + ext4_set_de_type(dir->i_sb, de, S_IFDIR);
550 + de->file_type |= EXT4_DIRENT_LUFID;
555 @@ -2428,30 +2480,61 @@ retry:
560 + struct inode *inode;
565 struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
566 struct ext4_dir_entry_2 *de,
567 int blocksize, int csum_size,
568 unsigned int parent_ino, int dotdot_real_len)
570 + void *data1 = NULL, *data2 = NULL;
571 + int dot_reclen = 0;
573 + if (dotdot_real_len == 10) {
574 + struct tp_block *tpb = (struct tp_block *)inode;
575 + data1 = tpb->data1;
576 + data2 = tpb->data2;
577 + inode = tpb->inode;
578 + dotdot_real_len = 0;
580 de->inode = cpu_to_le32(inode->i_ino);
582 - de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
584 strcpy(de->name, ".");
585 ext4_set_de_type(inode->i_sb, de, S_IFDIR);
587 + /* get packed fid data*/
588 + data1 = ext4_dentry_get_data(inode->i_sb,
589 + (struct ext4_dentry_param *) data1);
592 + memcpy(&de->name[2], data1, *(char *) data1);
593 + de->file_type |= EXT4_DIRENT_LUFID;
595 + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
596 + dot_reclen = cpu_to_le16(de->rec_len);
597 de = ext4_next_entry(de, blocksize);
598 de->inode = cpu_to_le32(parent_ino);
600 + strcpy(de->name, "..");
601 + ext4_set_de_type(inode->i_sb, de, S_IFDIR);
602 + data2 = ext4_dentry_get_data(inode->i_sb,
603 + (struct ext4_dentry_param *) data2);
606 + memcpy(&de->name[3], data2, *(char *) data2);
607 + de->file_type |= EXT4_DIRENT_LUFID;
609 if (!dotdot_real_len)
610 de->rec_len = ext4_rec_len_to_disk(blocksize -
611 - (csum_size + EXT4_DIR_REC_LEN(1)),
612 + (csum_size + dot_reclen),
615 de->rec_len = ext4_rec_len_to_disk(
616 - EXT4_DIR_REC_LEN(de->name_len), blocksize);
617 + EXT4_DIR_REC_LEN(de), blocksize);
618 - strcpy(de->name, "..");
619 - ext4_set_de_type(inode->i_sb, de, S_IFDIR);
621 return ext4_next_entry(de, blocksize);
623 @@ -2457,8 +2540,10 @@ struct ext4_dir_entry_2 *ext4_init_dot_d
626 static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
627 - struct inode *inode)
628 + struct inode *inode,
629 + const void *data1, const void *data2)
631 + struct tp_block param;
632 struct buffer_head *dir_block = NULL;
633 struct ext4_dir_entry_2 *de;
634 struct ext4_dir_entry_tail *t;
635 @@ -2488,7 +2573,11 @@ static int ext4_init_new_dir(handle_t *h
638 de = (struct ext4_dir_entry_2 *)dir_block->b_data;
639 - ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
640 + param.inode = inode;
641 + param.data1 = (void *)data1;
642 + param.data2 = (void *)data2;
643 + ext4_init_dot_dotdot((struct inode *)(¶m), de, blocksize,
644 + csum_size, dir->i_ino, 10);
647 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
648 @@ -2402,6 +2426,29 @@ out:
652 +/* Initialize @inode as a subdirectory of @dir, and add the
653 + * "." and ".." entries into the first directory block. */
654 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
655 + struct inode *inode,
656 + const void *data1, const void *data2)
660 + if (IS_ERR(handle))
661 + return PTR_ERR(handle);
663 + if (IS_DIRSYNC(dir))
664 + ext4_handle_sync(handle);
666 + inode->i_op = &ext4_dir_inode_operations.ops;
667 + inode->i_fop = &ext4_dir_operations;
668 + rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
670 + rc = ext4_mark_inode_dirty(handle, inode);
673 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
675 static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
678 @@ -2546,7 +2636,7 @@ retry:
680 inode->i_op = &ext4_dir_inode_operations;
681 inode->i_fop = &ext4_dir_operations;
682 - err = ext4_init_new_dir(handle, dir, inode);
683 + err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
685 goto out_clear_inode;
686 err = ext4_mark_inode_dirty(handle, inode);
687 @@ -2598,7 +2688,7 @@ static int empty_dir(struct inode *inode
691 - if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
692 + if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
693 EXT4_ERROR_INODE(inode, "invalid size");
696 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
697 ===================================================================
698 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/inline.c
699 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
700 @@ -988,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
702 err = ext4_find_dest_de(dir, inode, iloc->bh,
703 inline_start, inline_size,
704 - name, namelen, &de);
705 + name, namelen, &de, NULL);
709 @@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
710 err = ext4_journal_get_write_access(handle, iloc->bh);
713 - ext4_insert_dentry(inode, de, inline_size, name, namelen);
714 + ext4_insert_dentry(inode, de, inline_size, name, namelen, NULL);
716 ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
718 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
719 int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
720 int new_size = get_max_inline_xattr_value_size(dir, iloc);
722 - if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
723 + if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
726 ret = ext4_update_inline_data(handle, dir,
727 @@ -1348,7 +1348,7 @@ int htree_inlinedir_to_tree(struct file
729 strcpy(fake.name, ".");
730 fake.rec_len = ext4_rec_len_to_disk(
731 - EXT4_DIR_REC_LEN(fake.name_len),
732 + EXT4_DIR_REC_LEN(&fake),
734 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
736 @@ -1358,7 +1358,7 @@ int htree_inlinedir_to_tree(struct file
738 strcpy(fake.name, "..");
739 fake.rec_len = ext4_rec_len_to_disk(
740 - EXT4_DIR_REC_LEN(fake.name_len),
741 + EXT4_DIR_REC_LEN(&fake),
743 ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
745 @@ -1455,8 +1455,8 @@ int ext4_read_inline_dir(struct file *fi
746 * So we will use extra_offset and extra_size to indicate them
747 * during the inline dir iteration.
749 - dotdot_offset = EXT4_DIR_REC_LEN(1);
750 - dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
751 + dotdot_offset = __EXT4_DIR_REC_LEN(1);
752 + dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
753 extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
754 extra_size = extra_offset + inline_size;
756 @@ -1493,7 +1493,7 @@ revalidate:
757 * failure will be detected in the
758 * dirent test below. */
759 if (ext4_rec_len_from_disk(de->rec_len,
760 - extra_size) < EXT4_DIR_REC_LEN(1))
761 + extra_size) < __EXT4_DIR_REC_LEN(1))
763 i += ext4_rec_len_from_disk(de->rec_len,
765 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
766 ===================================================================
767 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/super.c
768 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
769 @@ -1151,7 +1151,7 @@ enum {
770 Opt_data_err_abort, Opt_data_err_ignore,
771 Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
772 Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
773 - Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
774 + Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
775 Opt_usrquota, Opt_grpquota, Opt_i_version,
776 Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
777 Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
778 @@ -1216,6 +1216,7 @@ static const match_table_t tokens = {
779 {Opt_stripe, "stripe=%u"},
780 {Opt_delalloc, "delalloc"},
781 {Opt_nodelalloc, "nodelalloc"},
782 + {Opt_dirdata, "dirdata"},
783 {Opt_removed, "mblk_io_submit"},
784 {Opt_removed, "nomblk_io_submit"},
785 {Opt_block_validity, "block_validity"},
786 @@ -1424,6 +1425,7 @@ static const struct mount_opts {
787 {Opt_usrjquota, 0, MOPT_Q},
788 {Opt_grpjquota, 0, MOPT_Q},
789 {Opt_offusrjquota, 0, MOPT_Q},
790 + {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
791 {Opt_offgrpjquota, 0, MOPT_Q},
792 {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
793 {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},