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,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);
 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 +       struct ext4_dir_entry_tail *t = (struct ext4_dir_entry_tail *)de;
 211 +
 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)
 217 +               return 0;
 218 +
 219 +       while (extra_data_flags) {
 220 +               if (extra_data_flags & 1) {
 221 +                       dlen += *len + (dlen == 0);
 222 +                       len += *len;
 223 +               }
 224 +               extra_data_flags >>= 1;
 225 +       }
 226 +       return dlen;
 227 +}
 228 +
 229  #endif /* __KERNEL__ */
 230
 231  #endif /* _EXT4_H */
 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,
 245                                  struct inode *dir,
 246 @@ -379,22 +380,23 @@ static struct dx_countlimit *get_dx_coun
 247  {
 248         struct ext4_dir_entry *dp;
 249         struct dx_root_info *root;
 250 -       int count_offset;
 251 +       int count_offset, dot_rec_len, dotdot_rec_len;
 252
 253         if (le16_to_cpu(dirent->rec_len) == EXT4_BLOCK_SIZE(inode->i_sb))
 254                 count_offset = 8;
 255 -       else if (le16_to_cpu(dirent->rec_len) == 12) {
 256 -               dp = (struct ext4_dir_entry *)(((void *)dirent) + 12);
 257 +       else {
 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)
 263                         return NULL;
 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))
 269                         return NULL;
 270 -               count_offset = 32;
 271 -       } else
 272 -               return NULL;
 273 +               count_offset = 8 + dot_rec_len + dotdot_rec_len;
 274 +       }
 275
 276         if (offset)
 277                 *offset = count_offset;
 278 @@ -504,11 +505,12 @@ ext4_next_entry(struct ext4_dir_entry_2
 279  */
 280  struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
 281  {
 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));
 287
 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));
 292
 293         return (struct dx_root_info *)de;
 294  }
 295 @@ -553,10 +555,16 @@ static inline void dx_set_limit(struct d
 296         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
 297  }
 298
 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)
 302  {
 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;
 307 +
 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;
 312
 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
 316
 317  static inline unsigned dx_node_limit(struct inode *dir)
 318  {
 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);
 321
 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));
 327                         }
 328 -                       space += EXT4_DIR_REC_LEN(de->name_len);
 329 +                       space += EXT4_DIR_REC_LEN(de);
 330                         names++;
 331                 }
 332                 de = ext4_next_entry(de, size);
 333 @@ -723,11 +731,14 @@ dx_probe(const struct qstr *d_name, stru
 334
 335         entries = (struct dx_entry *) (((char *)info) + info->info_length);
 336
 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 *)frame->bh->b_data,
 341 +                         info->info_length)) {
 342                 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
 343                                    dx_get_limit(entries),
 344 -                                  dx_root_limit(dir, info->info_length));
 345 +                                  dx_root_limit(dir,
 346 +                                         (struct ext4_dir_entry_2 *)frame->bh->b_data,
 347 +                                         info->info_length));
 348                 goto fail;
 349         }
 350
 351 @@ -916,7 +925,7 @@ static int htree_dirblock_to_tree(struct
 352         de = (struct ext4_dir_entry_2 *) bh->b_data;
 353         top = (struct ext4_dir_entry_2 *) ((char *) de +
 354                                            dir->i_sb->s_blocksize -
 355 -                                          EXT4_DIR_REC_LEN(0));
 356 +                                          __EXT4_DIR_REC_LEN(0));
 357  #ifdef CONFIG_EXT4_FS_ENCRYPTION
 358         /* Check if the directory is encrypted */
 359         if (ext4_encrypted_inode(dir)) {
 360 @@ -1508,7 +1517,7 @@ dx_move_dirents(char *from, char *to, st
 361         while (count--) {
 362                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 363                                                 (from + (map->offs<<2));
 364 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 365 +               rec_len = EXT4_DIR_REC_LEN(de);
 366                 memcpy (to, de, rec_len);
 367                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 368                                 ext4_rec_len_to_disk(rec_len, blocksize);
 369 @@ -1532,7 +1541,7 @@ static struct ext4_dir_entry_2* dx_pack_
 370         while ((char*)de < base + blocksize) {
 371                 next = ext4_next_entry(de, blocksize);
 372                 if (de->inode && de->name_len) {
 373 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 374 +                       rec_len = EXT4_DIR_REC_LEN(de);
 375                         if (de > to)
 376                                 memmove(to, de, rec_len);
 377                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 378 @@ -1664,15 +1673,17 @@ int ext4_find_dest_de(struct inode *dir,
 379                       struct buffer_head *bh,
 380                       void *buf, int buf_size,
 381                       struct ext4_filename *fname,
 382 -                     struct ext4_dir_entry_2 **dest_de)
 383 +                     struct ext4_dir_entry_2 **dest_de, int *dlen)
 384  {
 385         struct ext4_dir_entry_2 *de;
 386 -       unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
 387 +       unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
 388 +                                                 (dlen ? *dlen : 0);
 389         int nlen, rlen;
 390         unsigned int offset = 0;
 391         char *top;
 392         int res;
 393
 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,
 399                         res = -EEXIST;
 400                         goto return_result;
 401                 }
 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)
 406                         break;
 407 +               /* Then for dotdot entries, check for the smaller space
 408 +                * required for just the entry, no FID */
 409 +               if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
 410 +                       if ((de->inode ? rlen - nlen : rlen) >=
 411 +                           __EXT4_DIR_REC_LEN(fname_len(fname))) {
 412 +                               /* set dlen=1 to indicate not
 413 +                                * enough space store fid */
 414 +                               dlen ? *dlen = 1 : 0;
 415 +                               break;
 416 +                       }
 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. */
 421 +                       return -EIO;
 422 +               }
 423                 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
 424                 offset += rlen;
 425         }
 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,
 429                        int buf_size,
 430 -                      struct ext4_filename *fname)
 431 +                      struct ext4_filename *fname, void *data)
 432  {
 433
 434         int nlen, rlen;
 435
 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);
 439         if (de->inode) {
 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 = fname_len(fname);
 444         memcpy(de->name, fname_name(fname), fname_len(fname));
 445 +       if (data) {
 446 +               de->name[fname_len(fname)] = 0;
 447 +               memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
 448 +               de->file_type |= EXT4_DIRENT_LUFID;
 449 +       }
 450         return 0;
 451  }
 452  /*
 453 @@ -1734,18 +1765,23 @@ static int add_dirent_to_buf(handle_t *h
 454  static int add_dirent_to_buf(handle_t *handle, struct ext4_filename *fname,
 455                              struct inode *dir,
 456                              struct inode *inode, struct ext4_dir_entry_2 *de,
 457 -                            struct buffer_head *bh)
 458 +                            struct buffer_head *bh, struct dentry *dentry)
 459  {
 460         unsigned int    blocksize = dir->i_sb->s_blocksize;
 461         int             csum_size = 0;
 462 -       int             err;
 463 +       int             err, dlen = 0;
 464 +       unsigned char   *data;
 465
 466 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 467 +                                               dentry->d_fsdata);
 468         if (ext4_has_metadata_csum(inode->i_sb))
 469                 csum_size = sizeof(struct ext4_dir_entry_tail);
 470
 471         if (!de) {
 472 +               if (data)
 473 +                       dlen = (*data) + 1;
 474                 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
 475 -                                       blocksize - csum_size, fname, &de);
 476 +                                       blocksize - csum_size, fname, &de, &dlen);
 477                 if (err)
 478                         return err;
 479         }
 480 @@ -1755,7 +1791,10 @@ static int add_dirent_to_buf(handle_t *h
 481
 482         /* By now the buffer is marked for journaling. Due to crypto operations,
 483          * the following function call may fail */
 484 -       err = ext4_insert_dentry(dir, inode, de, blocksize, fname);
 485 +       /* If writing the short form of "dotdot", don't add the data section */
 486 +       if (dlen == 1)
 487 +               data = NULL;
 488 +       err = ext4_insert_dentry(dir, inode, de, blocksize, fname, data);
 489         if (err < 0)
 490                 return err;
 491
 492 @@ -1866,7 +1905,8 @@ static int make_indexed_dir(handle_t *ha
 493
 494         dx_set_block(entries, 1);
 495         dx_set_count(entries, 1);
 496 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 497 +       dx_set_limit(entries, dx_root_limit(dir,
 498 +                                        dot_de, sizeof(*dx_info)));
 499
 500         /* Initialize as for dx_probe */
 501         hinfo.hash_version = dx_info->hash_version;
 502 @@ -1876,14 +2476,14 @@ static int make_indexed_dir(handle_t *ha
 503         }
 504
 505 -       retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
 506 +       retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2, dentry);
 507  out_frames:
 508         /*
 509          * Even if the block split failed, we have to properly write
 510          * out all the changes we did so far. Otherwise we can end up
 511          * with corrupted filesystem.
 512          */
 513         if (retval)
 514                 ext4_mark_inode_dirty(handle, dir);
 515         dx_release(frames);
 516         brelse(bh);
 517         return retval;
 518 @@ -1909,6 +1949,8 @@ static int ext4_update_dotdot(handle_t *
 519         struct buffer_head * dir_block;
 520         struct ext4_dir_entry_2 * de;
 521         int len, journal = 0, err = 0;
 522 +       int dlen = 0;
 523 +       char *data;
 524
 525         if (IS_ERR(handle))
 526                 return PTR_ERR(handle);
 527 @@ -1924,19 +1966,24 @@ static int ext4_update_dotdot(handle_t *
 528         /* the first item must be "." */
 529         assert(de->name_len == 1 && de->name[0] == '.');
 530         len = le16_to_cpu(de->rec_len);
 531 -       assert(len >= EXT4_DIR_REC_LEN(1));
 532 -       if (len > EXT4_DIR_REC_LEN(1)) {
 533 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 534 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 535                 BUFFER_TRACE(dir_block, "get_write_access");
 536                 err = ext4_journal_get_write_access(handle, dir_block);
 537                 if (err)
 538                         goto out_journal;
 539
 540                 journal = 1;
 541 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 542 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 543         }
 544
 545 -       len -= EXT4_DIR_REC_LEN(1);
 546 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 547 +       len -= EXT4_DIR_REC_LEN(de);
 548 +       data = ext4_dentry_get_data(dir->i_sb,
 549 +                       (struct ext4_dentry_param *)dentry->d_fsdata);
 550 +       if (data)
 551 +               dlen = *data + 1;
 552 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 553 +
 554         de = (struct ext4_dir_entry_2 *)
 555                         ((char *) de + le16_to_cpu(de->rec_len));
 556         if (!journal) {
 557 @@ -1950,10 +1997,15 @@ static int ext4_update_dotdot(handle_t *
 558         if (len > 0)
 559                 de->rec_len = cpu_to_le16(len);
 560         else
 561 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 562 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 563         de->name_len = 2;
 564         strcpy(de->name, "..");
 565 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 566 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 567 +               de->name[2] = 0;
 568 +               memcpy(&de->name[2 + 1], data, *data);
 569 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 570 +               de->file_type |= EXT4_DIRENT_LUFID;
 571 +       }
 572
 573  out_journal:
 574         if (journal) {
 575 @@ -2039,7 +2639,7 @@ int __ext4_add_entry(handle_t *handle
 576                         goto out;
 577                 }
 578                 retval = add_dirent_to_buf(handle, &fname, dir, inode,
 579 -                                          NULL, bh);
 580 +                                          NULL, bh, dentry);
 581                 if (retval != -ENOSPC)
 582                         goto out;
 583
 584 @@ -2067,7 +2667,7 @@ int __ext4_add_entry(handle_t *handle
 585                 initialize_dirent_tail(t, blocksize);
 586         }
 587
 588 -       retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh);
 589 +       retval = add_dirent_to_buf(handle, &fname, dir, inode, de, bh, dentry);
 590  out:
 591         ext4_fname_free_filename(&fname);
 592         brelse(bh);
 593 @@ -2156,7 +2756,7 @@ again:
 594                 goto cleanup;
 595         }
 596
 597 -       err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh);
 598 +       err = add_dirent_to_buf(handle, fname, dir, inode, NULL, bh, dentry);
 599         if (err != -ENOSPC)
 600                 goto cleanup;
 601
 602 @@ -2213,7 +2913,7 @@ again:
 603                 err = PTR_ERR(de);
 604                 goto cleanup;
 605         }
 606 -       err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
 607 +       err = add_dirent_to_buf(handle, fname, dir, inode, de, bh, dentry);
 608         goto cleanup;
 609
 610  journal_error:
 611 @@ -2428,30 +2480,61 @@ retry:
 612         return err;
 613  }
 614
 615 +struct tp_block {
 616 +       struct inode *inode;
 617 +       void *data1;
 618 +       void *data2;
 619 +};
 620 +
 621  struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
 622                           struct ext4_dir_entry_2 *de,
 623                           int blocksize, int csum_size,
 624                           unsigned int parent_ino, int dotdot_real_len)
 625  {
 626 +       void *data1 = NULL, *data2 = NULL;
 627 +       int dot_reclen = 0;
 628 +
 629 +       if (dotdot_real_len == 10) {
 630 +               struct tp_block *tpb = (struct tp_block *)inode;
 631 +               data1 = tpb->data1;
 632 +               data2 = tpb->data2;
 633 +               inode = tpb->inode;
 634 +               dotdot_real_len = 0;
 635 +       }
 636         de->inode = cpu_to_le32(inode->i_ino);
 637         de->name_len = 1;
 638 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 639 -                                          blocksize);
 640         strcpy(de->name, ".");
 641         ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 642
 643 +       /* get packed fid data*/
 644 +       data1 = ext4_dentry_get_data(inode->i_sb,
 645 +                               (struct ext4_dentry_param *) data1);
 646 +       if (data1) {
 647 +               de->name[1] = 0;
 648 +               memcpy(&de->name[2], data1, *(char *) data1);
 649 +               de->file_type |= EXT4_DIRENT_LUFID;
 650 +       }
 651 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 652 +       dot_reclen = cpu_to_le16(de->rec_len);
 653         de = ext4_next_entry(de, blocksize);
 654         de->inode = cpu_to_le32(parent_ino);
 655         de->name_len = 2;
 656 +       strcpy(de->name, "..");
 657 +       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 658 +       data2 = ext4_dentry_get_data(inode->i_sb,
 659 +                       (struct ext4_dentry_param *) data2);
 660 +       if (data2) {
 661 +               de->name[2] = 0;
 662 +               memcpy(&de->name[3], data2, *(char *) data2);
 663 +               de->file_type |= EXT4_DIRENT_LUFID;
 664 +       }
 665         if (!dotdot_real_len)
 666                 de->rec_len = ext4_rec_len_to_disk(blocksize -
 667 -                                       (csum_size + EXT4_DIR_REC_LEN(1)),
 668 +                                       (csum_size + dot_reclen),
 669                                         blocksize);
 670         else
 671                 de->rec_len = ext4_rec_len_to_disk(
 672 -                               EXT4_DIR_REC_LEN(de->name_len), blocksize);
 673 +                               EXT4_DIR_REC_LEN(de), blocksize);
 674 -       strcpy(de->name, "..");
 675 -       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 676
 677         return ext4_next_entry(de, blocksize);
 678  }
 679 @@ -2457,8 +2540,10 @@ struct ext4_dir_entry_2 *ext4_init_dot_d
 680  }
 681
 682  static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 683 -                            struct inode *inode)
 684 +                            struct inode *inode,
 685 +                            const void *data1, const void *data2)
 686  {
 687 +       struct tp_block param;
 688         struct buffer_head *dir_block = NULL;
 689         struct ext4_dir_entry_2 *de;
 690         struct ext4_dir_entry_tail *t;
 691 @@ -2488,7 +2573,11 @@ static int ext4_init_new_dir(handle_t *h
 692         if (err)
 693                 goto out;
 694         de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 695 -       ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 696 +       param.inode = inode;
 697 +       param.data1 = (void *)data1;
 698 +       param.data2 = (void *)data2;
 699 +       ext4_init_dot_dotdot((struct inode *)(&param), de, blocksize,
 700 +                            csum_size, dir->i_ino, 10);
 701         set_nlink(inode, 2);
 702         if (csum_size) {
 703                 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
 704 @@ -2402,6 +2426,29 @@ out:
 705         return err;
 706  }
 707
 708 +/* Initialize @inode as a subdirectory of @dir, and add the
 709 + * "." and ".." entries into the first directory block. */
 710 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 711 +                       struct inode *inode,
 712 +                       const void *data1, const void *data2)
 713 +{
 714 +       int rc;
 715 +
 716 +       if (IS_ERR(handle))
 717 +               return PTR_ERR(handle);
 718 +
 719 +       if (IS_DIRSYNC(dir))
 720 +               ext4_handle_sync(handle);
 721 +
 722 +       inode->i_op = &ext4_dir_inode_operations;
 723 +       inode->i_fop = &ext4_dir_operations;
 724 +       rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
 725 +       if (!rc)
 726 +               rc = ext4_mark_inode_dirty(handle, inode);
 727 +       return rc;
 728 +}
 729 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 730 +
 731  static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 732  {
 733         handle_t *handle;
 734 @@ -2546,7 +2636,7 @@ retry:
 735
 736         inode->i_op = &ext4_dir_inode_operations;
 737         inode->i_fop = &ext4_dir_operations;
 738 -       err = ext4_init_new_dir(handle, dir, inode);
 739 +       err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
 740         if (err)
 741                 goto out_clear_inode;
 742         err = ext4_mark_inode_dirty(handle, inode);
 743 @@ -2598,7 +2688,7 @@ static int empty_dir(struct inode *inode
 744         }
 745
 746         sb = inode->i_sb;
 747 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
 748 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
 749                 EXT4_ERROR_INODE(inode, "invalid size");
 750                 return 1;
 751         }
 752 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
 753 ===================================================================
 754 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/inline.c
 755 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/inline.c
 756 @@ -988,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
 757
 758
 759         err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
 760 -                               inline_size, fname, &de);
 761 +                               inline_size, fname, &de, NULL);
 762         if (err)
 763                 return err;
 764
 765 @@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(han
 766         err = ext4_journal_get_write_access(handle, iloc->bh);
 767         if (err)
 768                 return err;
 769 -       ext4_insert_dentry(dir, inode, de, inline_size, fname);
 770 +       ext4_insert_dentry(dir, inode, de, inline_size, fname, NULL);
 771
 772         ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
 773
 774 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
 775         int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
 776         int new_size = get_max_inline_xattr_value_size(dir, iloc);
 777
 778 -       if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
 779 +       if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
 780                 return -ENOSPC;
 781
 782         ret = ext4_update_inline_data(handle, dir,
 783 @@ -1348,7 +1348,7 @@ int htree_inlinedir_to_tree(struct file
 784                         fake.name_len = 1;
 785                         strcpy(fake.name, ".");
 786                         fake.rec_len = ext4_rec_len_to_disk(
 787 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 788 +                                               EXT4_DIR_REC_LEN(&fake),
 789                                                 inline_size);
 790                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 791                         de = &fake;
 792 @@ -1358,7 +1358,7 @@ int htree_inlinedir_to_tree(struct file
 793                         fake.name_len = 2;
 794                         strcpy(fake.name, "..");
 795                         fake.rec_len = ext4_rec_len_to_disk(
 796 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 797 +                                               EXT4_DIR_REC_LEN(&fake),
 798                                                 inline_size);
 799                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 800                         de = &fake;
 801 @@ -1455,8 +1455,8 @@ int ext4_read_inline_dir(struct file *fi
 802          * So we will use extra_offset and extra_size to indicate them
 803          * during the inline dir iteration.
 804          */
 805 -       dotdot_offset = EXT4_DIR_REC_LEN(1);
 806 -       dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
 807 +       dotdot_offset = __EXT4_DIR_REC_LEN(1);
 808 +       dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
 809         extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
 810         extra_size = extra_offset + inline_size;
 811
 812 @@ -1493,7 +1493,7 @@ revalidate:
 813                          * failure will be detected in the
 814                          * dirent test below. */
 815                         if (ext4_rec_len_from_disk(de->rec_len, extra_size)
 816 -                               < EXT4_DIR_REC_LEN(1))
 817 +                               < __EXT4_DIR_REC_LEN(1))
 818                                 break;
 819                                 i += ext4_rec_len_from_disk(de->rec_len,
 820                                                             extra_size);
 821 Index: linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
 822 ===================================================================
 823 --- linux-3.10.0-123.13.2.el7.x86_64.orig/fs/ext4/super.c
 824 +++ linux-3.10.0-123.13.2.el7.x86_64/fs/ext4/super.c
 825 @@ -1151,7 +1151,7 @@ enum {
 826         Opt_data_err_abort, Opt_data_err_ignore,
 827         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 828         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 829 -       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 830 +       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
 831         Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
 832         Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 833         Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
 834 @@ -1216,6 +1216,7 @@ static const match_table_t tokens = {
 835         {Opt_stripe, "stripe=%u"},
 836         {Opt_delalloc, "delalloc"},
 837         {Opt_nodelalloc, "nodelalloc"},
 838 +       {Opt_dirdata, "dirdata"},
 839         {Opt_removed, "mblk_io_submit"},
 840         {Opt_removed, "nomblk_io_submit"},
 841         {Opt_block_validity, "block_validity"},
 842 @@ -1424,6 +1425,7 @@ static const struct mount_opts {
 843         {Opt_usrjquota, 0, MOPT_Q},
 844         {Opt_grpjquota, 0, MOPT_Q},
 845         {Opt_offusrjquota, 0, MOPT_Q},
 846 +       {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
 847         {Opt_offgrpjquota, 0, MOPT_Q},
 848         {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
 849         {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},