ldiskfs/kernel_patches/patches/sles12sp2/ext4-data-in-dirent.patch

   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
   5 is present.
   6
   7 make use of dentry->d_fsdata to pass fid to ext4. so no
   8 changes in ext4_add_entry() interface required.
   9
  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);
  17
  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))
  34                                         break;
  35                                 i += ext4_rec_len_from_disk(de->rec_len,
  36                                                             sb->s_blocksize);
  37 @@ -438,12 +438,17 @@ int ext4_htree_store_dirent(struct file
  38         struct fname *fname, *new_fn;
  39         struct dir_private_info *info;
  40         int len;
  41 +       int extra_data = 0;
  42
  43         info = dir_file->private_data;
  44         p = &info->root.rb_node;
  45
  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);
  50 +
  51 +       len = sizeof(struct fname) + ent_name->len + extra_data + 1;
  52 +
  53         new_fn = kzalloc(len, GFP_KERNEL);
  54         if (!new_fn)
  55                 return -ENOMEM;
  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;
  63
  64         while (*p) {
  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))
  68                         return -EFSCORRUPTED;
  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);
  73                 offset += 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
  96
  97  #define EXT4_FT_MAX            8
  98 +#define EXT4_FT_MASK           0xf
  99 +
 100 +#if EXT4_FT_MAX > EXT4_FT_MASK
 101 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
 102 +#endif
 103 +
 104 +/*
 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.
 108 +*/
 109 +/*
 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.
 114 +  */
 115 +#define EXT4_DIRENT_LUFID              0x10
 116 +
 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 */
 122 +} __packed;
 123 +
 124 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
 125 +                                                 struct ext4_dentry_param *p)
 126 +
 127 +{
 128 +       if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_DIRDATA))
 129 +               return NULL;
 130 +       if (p && p->edp_magic == EXT4_LUFID_MAGIC)
 131 +               return &p->edp_len;
 132 +       else
 133 +               return NULL;
 134 +}
 135
 136  #define EXT4_FT_DIR_CSUM       0xDE
 137
 138 @@ -1650,8 +1689,11 @@ struct ext4_dir_entry_tail {
 139   */
 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) & \
 144                                          ~EXT4_DIR_ROUND)
 145 +#define EXT4_DIR_REC_LEN(de)           (__EXT4_DIR_REC_LEN((de)->name_len +\
 146 +                                       ext4_get_dirent_data_len(de)))
 147 +
 148  #define EXT4_MAX_REC_LEN               ((1<<16)-1)
 149
 150  /*
 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,
 158                        struct inode *inode,
 159                        struct ext4_dir_entry_2 *de,
 160                        int buf_size,
 161 -                      struct ext4_filename *fname);
 162 +                      struct ext4_filename *fname, void *data);
 163  static inline void ext4_update_dx_flag(struct inode *inode)
 164  {
 165         if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
 166 @@ -2004,10 +2046,17 @@ static unsigned char ext4_filetype_table
 167
 168  static inline  unsigned char get_dtype(struct super_block *sb, int filetype)
 169  {
 170 +       int fl_index = filetype & EXT4_FT_MASK;
 171 +
 172 -       if (!ext4_has_feature_filetype(sb) || filetype >= EXT4_FT_MAX)
 173 +       if (!ext4_has_feature_filetype(sb) || fl_index >= EXT4_FT_MAX)
 174                 return DT_UNKNOWN;
 175
 176 -       return ext4_filetype_table[filetype];
 177 +       if (!test_opt(sb, DIRDATA))
 178 +               return ext4_filetype_table[fl_index];
 179 +
 180 +       return (ext4_filetype_table[fl_index]) |
 181 +               (filetype & EXT4_DIRENT_LUFID);
 182 +
 183  }
 184
 185  /* fsync.c */
 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);
 198
 199 +/*
 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.
 204 + */
 205 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
 206 +{
 207 +       char *len = de->name + de->name_len + 1 /* NUL terminator */;
 208 +       int dlen = 0;
 209 +       __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
 210 +
 211 +       while (extra_data_flags) {
 212 +               if (extra_data_flags & 1) {
 213 +                       dlen += *len + (dlen == 0);
 214 +                       len += *len;
 215 +               }
 216 +               extra_data_flags >>= 1;
 217 +       }
 218 +       return dlen;
 219 +}
 220 +
 221  #endif /* __KERNEL__ */
 222
 223  #endif /* _EXT4_H */
 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 @@ -241,7 +241,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(struct ext4_filename *fname,
 237                                  struct inode *dir,
 238 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2
 239   */
 240  struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
 241  {
 242 +       BUG_ON(de->name_len != 1);
 243         /* get dotdot first */
 244 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
 245 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 246
 247         /* dx root info is after dotdot entry */
 248 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
 249 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 250
 251         return (struct dx_root_info *)de;
 252  }
 253 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct d
 254         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
 255  }
 256
 257 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
 258 +static inline unsigned dx_root_limit(struct inode *dir,
 259 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize)
 260  {
 261 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
 262 -               EXT4_DIR_REC_LEN(2) - infosize;
 263 +       struct ext4_dir_entry_2 *dotdot_de;
 264 +       unsigned entry_space;
 265 +
 266 +       BUG_ON(dot_de->name_len != 1);
 267 +       dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
 268 +       entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
 269 +                        EXT4_DIR_REC_LEN(dotdot_de) - infosize;
 270
 271         if (ext4_has_metadata_csum(dir->i_sb))
 272                 entry_space -= sizeof(struct dx_tail);
 273 @@ -565,7 +573,7 @@ static inline unsigned dx_root_limit(str
 274
 275  static inline unsigned dx_node_limit(struct inode *dir)
 276  {
 277 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
 278 +       unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
 279
 280         if (ext4_has_metadata_csum(dir->i_sb))
 281                 entry_space -= sizeof(struct dx_tail);
 282 @@ -674,7 +682,7 @@ static struct stats dx_show_leaf(struct
 283                                        (unsigned) ((char *) de - base));
 284  #endif
 285                         }
 286 -                       space += EXT4_DIR_REC_LEN(de->name_len);
 287 +                       space += EXT4_DIR_REC_LEN(de);
 288                         names++;
 289                 }
 290                 de = ext4_next_entry(de, size);
 291 @@ -775,11 +783,14 @@ dx_probe(struct ext4_filename *fname, st
 292
 293         entries = (struct dx_entry *)(((char *)info) + info->info_length);
 294
 295 -       if (dx_get_limit(entries) != dx_root_limit(dir,
 296 -                                                  info->info_length)) {
 297 +       if (dx_get_limit(entries) !=
 298 +           dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
 299 +                         info->info_length)) {
 300                 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
 301                                    dx_get_limit(entries),
 302 -                                  dx_root_limit(dir, info->info_length));
 303 +                                  dx_root_limit(dir,
 304 +                                         (struct ext4_dir_entry_2 *)frame->bh->b_data,
 305 +                                         info->info_length));
 306                 goto fail;
 307         }
 308
 309 @@ -963,7 +974,7 @@ static int htree_dirblock_to_tree(struct
 310         de = (struct ext4_dir_entry_2 *) bh->b_data;
 311         top = (struct ext4_dir_entry_2 *) ((char *) de +
 312                                            dir->i_sb->s_blocksize -
 313 -                                          EXT4_DIR_REC_LEN(0));
 314 +                                          __EXT4_DIR_REC_LEN(0));
 315  #ifdef CONFIG_EXT4_FS_ENCRYPTION
 316         /* Check if the directory is encrypted */
 317         if (ext4_encrypted_inode(dir)) {
 318 @@ -1688,7 +1699,7 @@ dx_move_dirents(char *from, char *to, st
 319         while (count--) {
 320                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 321                                                 (from + (map->offs<<2));
 322 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 323 +               rec_len = EXT4_DIR_REC_LEN(de);
 324                 memcpy (to, de, rec_len);
 325                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 326                                 ext4_rec_len_to_disk(rec_len, blocksize);
 327 @@ -1712,7 +1723,7 @@ static struct ext4_dir_entry_2* dx_pack_
 328         while ((char*)de < base + blocksize) {
 329                 next = ext4_next_entry(de, blocksize);
 330                 if (de->inode && de->name_len) {
 331 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 332 +                       rec_len = EXT4_DIR_REC_LEN(de);
 333                         if (de > to)
 334                                 memmove(to, de, rec_len);
 335                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 336 @@ -1843,15 +1854,17 @@ int ext4_find_dest_de(struct inode *dir,
 337                       struct buffer_head *bh,
 338                       void *buf, int buf_size,
 339                       struct ext4_filename *fname,
 340 -                     struct ext4_dir_entry_2 **dest_de)
 341 +                     struct ext4_dir_entry_2 **dest_de, int *dlen)
 342  {
 343         struct ext4_dir_entry_2 *de;
 344 -       unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
 345 +       unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
 346 +                                                 (dlen ? *dlen : 0);
 347         int nlen, rlen;
 348         unsigned int offset = 0;
 349         char *top;
 350         int res;
 351
 352 +       dlen ? *dlen = 0 : 0; /* default set to 0 */
 353         de = (struct ext4_dir_entry_2 *)buf;
 354         top = buf + buf_size - reclen;
 355         while ((char *) de <= top) {
 356 @@ -1868,10 +1881,26 @@ int ext4_find_dest_de(struct inode *dir,
 357                         res = -EEXIST;
 358                         goto return_result;
 359                 }
 360 -               nlen = EXT4_DIR_REC_LEN(de->name_len);
 361 +               nlen = EXT4_DIR_REC_LEN(de);
 362                 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 363                 if ((de->inode ? rlen - nlen : rlen) >= reclen)
 364                         break;
 365 +               /* Then for dotdot entries, check for the smaller space
 366 +                * required for just the entry, no FID */
 367 +               if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
 368 +                       if ((de->inode ? rlen - nlen : rlen) >=
 369 +                           __EXT4_DIR_REC_LEN(fname_len(fname))) {
 370 +                               /* set dlen=1 to indicate not
 371 +                                * enough space store fid */
 372 +                               dlen ? *dlen = 1 : 0;
 373 +                               break;
 374 +                       }
 375 +                       /* The new ".." entry must be written over the
 376 +                        * previous ".." entry, which is the first
 377 +                        * entry traversed by this scan. If it doesn't
 378 +                        * fit, something is badly wrong, so -EIO. */
 379 +                       return -EIO;
 380 +               }
 381                 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
 382                 offset += rlen;
 383         }
 384 @@ -1890,12 +1919,12 @@ int ext4_insert_dentry(struct inode *dir
 385                        struct inode *inode,
 386                        struct ext4_dir_entry_2 *de,
 387                        int buf_size,
 388 -                      struct ext4_filename *fname)
 389 +                      struct ext4_filename *fname, void *data)
 390  {
 391
 392         int nlen, rlen;
 393
 394 -       nlen = EXT4_DIR_REC_LEN(de->name_len);
 395 +       nlen = EXT4_DIR_REC_LEN(de);
 396         rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 397         if (de->inode) {
 398                 struct ext4_dir_entry_2 *de1 =
 399 @@ -1909,6 +1938,11 @@ int ext4_insert_dentry(struct inode *dir
 400         ext4_set_de_type(inode->i_sb, de, inode->i_mode);
 401         de->name_len = fname_len(fname);
 402         memcpy(de->name, fname_name(fname), fname_len(fname));
 403 +       if (data) {
 404 +               de->name[fname_len(fname)] = 0;
 405 +               memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
 406 +               de->file_type |= EXT4_DIRENT_LUFID;
 407 +       }
 408         return 0;
 409  }
 410
 411 @@ -1923,18 +1957,23 @@ int ext4_insert_dentry(struct inode *dir
 412  static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
 413                              struct inode *dir,
 414                              struct inode *inode, struct ext4_dir_entry_2 *de,
 415 -                            struct buffer_head *bh)
 416 +                            struct buffer_head *bh, struct dentry *dentry)
 417  {
 418         unsigned int    blocksize = dir->i_sb->s_blocksize;
 419         int             csum_size = 0;
 420 -       int             err;
 421 +       int             err, dlen = 0;
 422 +       unsigned char   *data;
 423
 424 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 425 +                                               dentry->d_fsdata);
 426         if (ext4_has_metadata_csum(inode->i_sb))
 427                 csum_size = sizeof(struct ext4_dir_entry_tail);
 428
 429         if (!de) {
 430 +               if (data)
 431 +                       dlen = (*data) + 1;
 432                 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
 433 -                                       blocksize - csum_size, fname, &de);
 434 +                                       blocksize - csum_size, fname, &de, &dlen);
 435                 if (err)
 436                         return err;
 437         }
 438 @@ -1947,7 +1986,10 @@ static int add_dirent_to_buf(handle_t *h
 439
 440         /* By now the buffer is marked for journaling. Due to crypto operations,
 441          * the following function call may fail */
 442 -       err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
 443 +       /* If writing the short form of "dotdot", don't add the data section */
 444 +       if (dlen == 1)
 445 +               data = NULL;
 446 +       err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
 447         if (err < 0)
 448                 return err;
 449
 450 @@ -2059,7 +2101,8 @@ static int make_indexed_dir(handle_t *ha
 451
 452         dx_set_block(entries, 1);
 453         dx_set_count(entries, 1);
 454 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 455 +       dx_set_limit(entries, dx_root_limit(dir,
 456 +                                        dot_de, sizeof(*dx_info)));
 457
 458         /* Initialize as for dx_probe */
 459         fname->hinfo.hash_version = dx_info->hash_version;
 460 @@ -2087,7 +2130,7 @@ static int make_indexed_dir(handle_t *ha
 461                 goto out_frames;
 462         }
 463
 464 -       retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
 465 +       retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
 466  out_frames:
 467         /*
 468          * Even if the block split failed, we have to properly write
 469 @@ -2109,6 +2152,8 @@ static int ext4_update_dotdot(handle_t *
 470         struct buffer_head *dir_block;
 471         struct ext4_dir_entry_2 *de;
 472         int len, journal = 0, err = 0;
 473 +       int dlen = 0;
 474 +       char *data;
 475
 476         if (IS_ERR(handle))
 477                 return PTR_ERR(handle);
 478 @@ -2126,19 +2171,24 @@ static int ext4_update_dotdot(handle_t *
 479         /* the first item must be "." */
 480         assert(de->name_len == 1 && de->name[0] == '.');
 481         len = le16_to_cpu(de->rec_len);
 482 -       assert(len >= EXT4_DIR_REC_LEN(1));
 483 -       if (len > EXT4_DIR_REC_LEN(1)) {
 484 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 485 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 486                 BUFFER_TRACE(dir_block, "get_write_access");
 487                 err = ext4_journal_get_write_access(handle, dir_block);
 488                 if (err)
 489                         goto out_journal;
 490
 491                 journal = 1;
 492 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 493 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 494         }
 495
 496 -       len -= EXT4_DIR_REC_LEN(1);
 497 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 498 +       len -= EXT4_DIR_REC_LEN(de);
 499 +       data = ext4_dentry_get_data(dir->i_sb,
 500 +                       (struct ext4_dentry_param *)dentry->d_fsdata);
 501 +       if (data)
 502 +               dlen = *data + 1;
 503 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 504 +
 505         de = (struct ext4_dir_entry_2 *)
 506                         ((char *) de + le16_to_cpu(de->rec_len));
 507         if (!journal) {
 508 @@ -2152,10 +2202,15 @@ static int ext4_update_dotdot(handle_t *
 509         if (len > 0)
 510                 de->rec_len = cpu_to_le16(len);
 511         else
 512 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 513 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 514         de->name_len = 2;
 515         strcpy(de->name, "..");
 516 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 517 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 518 +               de->name[2] = 0;
 519 +               memcpy(&de->name[2 + 1], data, *data);
 520 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 521 +               de->file_type |= EXT4_DIRENT_LUFID;
 522 +       }
 523
 524  out_journal:
 525         if (journal) {
 526 @@ -2237,7 +2292,7 @@ static int ext4_add_entry(handle_t *hand
 527                         goto out;
 528                 }
 529                 retval = add_dirent_to_buf(handle, &fname, dir, inode,
 530 -                                          NULL, bh);
 531 +                                          NULL, bh, dentry);
 532                 if (retval != -ENOSPC)
 533                         goto out;
 534
 535 @@ -2265,7 +2320,7 @@ static int ext4_add_entry(handle_t *hand
 536                 initialize_dirent_tail(t, blocksize);
 537         }
 538
 539 -       retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
 540 +       retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
 541  out:
 542         ext4_fname_free_filename(&fname);
 543         brelse(bh);
 544 @@ -2305,7 +2360,7 @@ static int ext4_dx_add_entry(handle_t *h
 545         if (err)
 546                 goto journal_error;
 547
 548 -       err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
 549 +       err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
 550         if (err != -ENOSPC)
 551                 goto cleanup;
 552
 553 @@ -2409,7 +2464,7 @@ static int ext4_dx_add_entry(handle_t *h
 554                 err = PTR_ERR(de);
 555                 goto cleanup;
 556         }
 557 -       err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
 558 +       err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
 559         goto cleanup;
 560
 561  journal_error:
 562 @@ -2683,37 +2738,70 @@ err_unlock_inode:
 563         return err;
 564  }
 565
 566 +struct tp_block {
 567 +       struct inode *inode;
 568 +       void *data1;
 569 +       void *data2;
 570 +};
 571 +
 572  struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
 573                           struct ext4_dir_entry_2 *de,
 574                           int blocksize, int csum_size,
 575                           unsigned int parent_ino, int dotdot_real_len)
 576  {
 577 +       void *data1 = NULL, *data2 = NULL;
 578 +       int dot_reclen = 0;
 579 +
 580 +       if (dotdot_real_len == 10) {
 581 +               struct tp_block *tpb = (struct tp_block *)inode;
 582 +               data1 = tpb->data1;
 583 +               data2 = tpb->data2;
 584 +               inode = tpb->inode;
 585 +               dotdot_real_len = 0;
 586 +       }
 587         de->inode = cpu_to_le32(inode->i_ino);
 588         de->name_len = 1;
 589 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 590 -                                          blocksize);
 591         strcpy(de->name, ".");
 592         ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 593
 594 +       /* get packed fid data*/
 595 +       data1 = ext4_dentry_get_data(inode->i_sb,
 596 +                               (struct ext4_dentry_param *) data1);
 597 +       if (data1) {
 598 +               de->name[1] = 0;
 599 +               memcpy(&de->name[2], data1, *(char *) data1);
 600 +               de->file_type |= EXT4_DIRENT_LUFID;
 601 +       }
 602 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 603 +       dot_reclen = cpu_to_le16(de->rec_len);
 604         de = ext4_next_entry(de, blocksize);
 605         de->inode = cpu_to_le32(parent_ino);
 606         de->name_len = 2;
 607 +       strcpy(de->name, "..");
 608 +       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 609 +       data2 = ext4_dentry_get_data(inode->i_sb,
 610 +                       (struct ext4_dentry_param *) data2);
 611 +       if (data2) {
 612 +               de->name[2] = 0;
 613 +               memcpy(&de->name[3], data2, *(char *) data2);
 614 +               de->file_type |= EXT4_DIRENT_LUFID;
 615 +       }
 616         if (!dotdot_real_len)
 617                 de->rec_len = ext4_rec_len_to_disk(blocksize -
 618 -                                       (csum_size + EXT4_DIR_REC_LEN(1)),
 619 +                                       (csum_size + dot_reclen),
 620                                         blocksize);
 621         else
 622                 de->rec_len = ext4_rec_len_to_disk(
 623 -                               EXT4_DIR_REC_LEN(de->name_len), blocksize);
 624 -       strcpy(de->name, "..");
 625 -       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 626 +                               EXT4_DIR_REC_LEN(de), blocksize);
 627
 628         return ext4_next_entry(de, blocksize);
 629  }
 630
 631  static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 632 -                            struct inode *inode)
 633 +                            struct inode *inode,
 634 +                            const void *data1, const void *data2)
 635  {
 636 +       struct tp_block param;
 637         struct buffer_head *dir_block = NULL;
 638         struct ext4_dir_entry_2 *de;
 639         struct ext4_dir_entry_tail *t;
 640 @@ -2738,7 +2826,11 @@ static int ext4_init_new_dir(handle_t *h
 641         if (IS_ERR(dir_block))
 642                 return PTR_ERR(dir_block);
 643         de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 644 -       ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 645 +       param.inode = inode;
 646 +       param.data1 = (void *)data1;
 647 +       param.data2 = (void *)data2;
 648 +       ext4_init_dot_dotdot((struct inode *)(&param), de, blocksize,
 649 +                            csum_size, dir->i_ino, 10);
 650         set_nlink(inode, 2);
 651         if (csum_size) {
 652                 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
 653 @@ -2755,6 +2847,29 @@ out:
 654         return err;
 655  }
 656
 657 +/* Initialize @inode as a subdirectory of @dir, and add the
 658 + * "." and ".." entries into the first directory block. */
 659 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 660 +                       struct inode *inode,
 661 +                       const void *data1, const void *data2)
 662 +{
 663 +       int rc;
 664 +
 665 +       if (IS_ERR(handle))
 666 +               return PTR_ERR(handle);
 667 +
 668 +       if (IS_DIRSYNC(dir))
 669 +               ext4_handle_sync(handle);
 670 +
 671 +       inode->i_op = &ext4_dir_inode_operations;
 672 +       inode->i_fop = &ext4_dir_operations;
 673 +       rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
 674 +       if (!rc)
 675 +               rc = ext4_mark_inode_dirty(handle, inode);
 676 +       return rc;
 677 +}
 678 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 679 +
 680  static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 681  {
 682         handle_t *handle;
 683 @@ -2781,7 +2896,7 @@ retry:
 684
 685         inode->i_op = &ext4_dir_inode_operations;
 686         inode->i_fop = &ext4_dir_operations;
 687 -       err = ext4_init_new_dir(handle, dir, inode);
 688 +       err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
 689         if (err)
 690                 goto out_clear_inode;
 691         err = ext4_mark_inode_dirty(handle, inode);
 692 @@ -2832,7 +2947,7 @@ int ext4_empty_dir(struct inode *inode)
 693         }
 694
 695         sb = inode->i_sb;
 696 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
 697 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
 698                 EXT4_ERROR_INODE(inode, "invalid size");
 699                 return 1;
 700         }
 701 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
 702 ===================================================================
 703 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/inline.c
 704 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
 705 @@ -988,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
 706
 707
 708         err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
 709 -                               inline_size, fname, &de);
 710 +                               inline_size, fname, &de, NULL);
 711         if (err)
 712                 return err;
 713
 714 @@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
 715         err = ext4_journal_get_write_access(handle, iloc->bh);
 716         if (err)
 717                 return err;
 718 -       ext4_insert_dentry(dir, inode, de, inline_size, fname);
 719 +       ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
 720
 721         ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
 722
 723 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
 724         int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
 725         int new_size = get_max_inline_xattr_value_size(dir, iloc);
 726
 727 -       if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
 728 +       if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
 729                 return -ENOSPC;
 730
 731         ret = ext4_update_inline_data(handle, dir,
 732 @@ -1348,7 +1348,7 @@ int htree_inlinedir_to_tree(struct file
 733                         fake.name_len = 1;
 734                         strcpy(fake.name, ".");
 735                         fake.rec_len = ext4_rec_len_to_disk(
 736 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 737 +                                               EXT4_DIR_REC_LEN(&fake),
 738                                                 inline_size);
 739                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 740                         de = &fake;
 741 @@ -1358,7 +1358,7 @@ int htree_inlinedir_to_tree(struct file
 742                         fake.name_len = 2;
 743                         strcpy(fake.name, "..");
 744                         fake.rec_len = ext4_rec_len_to_disk(
 745 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 746 +                                               EXT4_DIR_REC_LEN(&fake),
 747                                                 inline_size);
 748                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 749                         de = &fake;
 750 @@ -1455,8 +1455,8 @@ int ext4_read_inline_dir(struct file *fi
 751          * So we will use extra_offset and extra_size to indicate them
 752          * during the inline dir iteration.
 753          */
 754 -       dotdot_offset = EXT4_DIR_REC_LEN(1);
 755 -       dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
 756 +       dotdot_offset = __EXT4_DIR_REC_LEN(1);
 757 +       dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
 758         extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
 759         extra_size = extra_offset + inline_size;
 760
 761 @@ -1493,7 +1493,7 @@ revalidate:
 762                          * failure will be detected in the
 763                          * dirent test below. */
 764                         if (ext4_rec_len_from_disk(de->rec_len, extra_size)
 765 -                               < EXT4_DIR_REC_LEN(1))
 766 +                               < __EXT4_DIR_REC_LEN(1))
 767                                 break;
 768                                 i += ext4_rec_len_from_disk(de->rec_len,
 769                                                             extra_size);
 770 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
 771 ===================================================================
 772 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/super.c
 773 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
 774 @@ -1151,7 +1151,7 @@ enum {
 775         Opt_data_err_abort, Opt_data_err_ignore,
 776         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 777         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 778 -       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 779 +       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
 780         Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
 781         Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 782         Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
 783 @@ -1216,6 +1216,7 @@ static const match_table_t tokens = {
 784         {Opt_stripe, "stripe=%u"},
 785         {Opt_delalloc, "delalloc"},
 786         {Opt_nodelalloc, "nodelalloc"},
 787 +       {Opt_dirdata, "dirdata"},
 788         {Opt_removed, "mblk_io_submit"},
 789         {Opt_removed, "nomblk_io_submit"},
 790         {Opt_block_validity, "block_validity"},
 791 @@ -1424,6 +1425,7 @@ static const struct mount_opts {
 792         {Opt_usrjquota, 0, MOPT_Q},
 793         {Opt_grpjquota, 0, MOPT_Q},
 794         {Opt_offusrjquota, 0, MOPT_Q},
 795 +       {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
 796         {Opt_offgrpjquota, 0, MOPT_Q},
 797         {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
 798         {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},