ldiskfs/kernel_patches/patches/ubuntu18/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-4.15.0/fs/ext4/dir.c
  11 ===================================================================
  12 --- linux-4.15.0.orig/fs/ext4/dir.c
  13 +++ linux-4.15.0/fs/ext4/dir.c
  14 @@ -68,11 +68,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 @@ -219,7 +219,7 @@ static int ext4_readdir(struct file *fil
  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 @@ -442,12 +442,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 @@ -456,7 +461,7 @@ int ext4_htree_store_dirent(struct file
  57         new_fn->inode = le32_to_cpu(dirent->inode);
  58         new_fn->name_len = ent_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 Index: linux-4.15.0/fs/ext4/ext4.h
  66 ===================================================================
  67 --- linux-4.15.0.orig/fs/ext4/ext4.h
  68 +++ linux-4.15.0/fs/ext4/ext4.h
  69 @@ -1055,6 +1055,7 @@ struct ext4_inode_info {
  70         __u32 i_csum_seed;
  71
  72         kprojid_t i_projid;
  73 +       void *i_dirdata;
  74  };
  75
  76  /*
  77 @@ -1098,6 +1099,7 @@ struct ext4_inode_info {
  78  #define EXT4_MOUNT_POSIX_ACL           0x08000 /* POSIX Access Control Lists */
  79  #define EXT4_MOUNT_NO_AUTO_DA_ALLOC    0x10000 /* No auto delalloc mapping */
  80  #define EXT4_MOUNT_BARRIER             0x20000 /* Use block barriers */
  81 +#define EXT4_MOUNT_DIRDATA             0x40000 /* Data in directory entries*/
  82  #define EXT4_MOUNT_QUOTA               0x40000 /* Some quota option set */
  83  #define EXT4_MOUNT_USRQUOTA            0x80000 /* "old" user quota,
  84                                                  * enable enforcement for hidden
  85 @@ -1768,6 +1770,7 @@ EXT4_FEATURE_INCOMPAT_FUNCS(encrypt,              EN
  86                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
  87                                          EXT4_FEATURE_INCOMPAT_EA_INODE| \
  88                                          EXT4_FEATURE_INCOMPAT_MMP | \
  89 +                                        EXT4_FEATURE_INCOMPAT_DIRDATA| \
  90                                          EXT4_FEATURE_INCOMPAT_INLINE_DATA | \
  91                                          EXT4_FEATURE_INCOMPAT_ENCRYPT | \
  92                                          EXT4_FEATURE_INCOMPAT_CSUM_SEED | \
  93 @@ -1943,6 +1946,43 @@ struct ext4_dir_entry_tail {
  94  #define EXT4_FT_SYMLINK                7
  95
  96  #define EXT4_FT_MAX            8
  97 +#define EXT4_FT_MASK           0xf
  98 +
  99 +#if EXT4_FT_MAX > EXT4_FT_MASK
 100 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
 101 +#endif
 102 +
 103 +/*
 104 + * d_type has 4 unused bits, so it can hold four types data. these different
 105 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
 106 + * stored, in flag order, after file-name in ext4 dirent.
 107 +*/
 108 +/*
 109 + * this flag is added to d_type if ext4 dirent has extra data after
 110 + * filename. this data length is variable and length is stored in first byte
 111 + * of data. data start after filename NUL byte.
 112 + * This is used by Lustre FS.
 113 +  */
 114 +#define EXT4_DIRENT_LUFID              0x10
 115 +
 116 +#define EXT4_LUFID_MAGIC    0xAD200907UL
 117 +struct ext4_dentry_param {
 118 +       __u32  edp_magic;       /* EXT4_LUFID_MAGIC */
 119 +       char   edp_len;         /* size of edp_data in bytes */
 120 +       char   edp_data[0];     /* packed array of data */
 121 +} __packed;
 122 +
 123 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
 124 +                                                 struct ext4_dentry_param *p)
 125 +
 126 +{
 127 +       if (!ext4_has_feature_dirdata(sb))
 128 +               return NULL;
 129 +       if (p && p->edp_magic == EXT4_LUFID_MAGIC)
 130 +               return &p->edp_len;
 131 +       else
 132 +               return NULL;
 133 +}
 134
 135  #define EXT4_FT_DIR_CSUM       0xDE
 136
 137 @@ -1953,8 +1993,11 @@ struct ext4_dir_entry_tail {
 138   */
 139  #define EXT4_DIR_PAD                   4
 140  #define EXT4_DIR_ROUND                 (EXT4_DIR_PAD - 1)
 141 -#define EXT4_DIR_REC_LEN(name_len)     (((name_len) + 8 + EXT4_DIR_ROUND) & \
 142 +#define __EXT4_DIR_REC_LEN(name_len)   (((name_len) + 8 + EXT4_DIR_ROUND) & \
 143                                          ~EXT4_DIR_ROUND)
 144 +#define EXT4_DIR_REC_LEN(de)           (__EXT4_DIR_REC_LEN((de)->name_len +\
 145 +                                       ext4_get_dirent_data_len(de)))
 146 +
 147  #define EXT4_MAX_REC_LEN               ((1<<16)-1)
 148
 149  /*
 150 @@ -2357,11 +2400,11 @@ extern int ext4_find_dest_de(struct inod
 151                              struct buffer_head *bh,
 152                              void *buf, int buf_size,
 153                              struct ext4_filename *fname,
 154 -                            struct ext4_dir_entry_2 **dest_de);
 155 +                            struct ext4_dir_entry_2 **dest_de, int *dlen);
 156  void ext4_insert_dentry(struct inode *inode,
 157                         struct ext4_dir_entry_2 *de,
 158                         int buf_size,
 159 -                       struct ext4_filename *fname);
 160 +                       struct ext4_filename *fname, void *data);
 161  static inline void ext4_update_dx_flag(struct inode *inode)
 162  {
 163         if (!ext4_has_feature_dir_index(inode->i_sb))
 164 @@ -2373,10 +2416,17 @@ static const unsigned char ext4_filetype
 165
 166  static inline  unsigned char get_dtype(struct super_block *sb, int filetype)
 167  {
 168 -       if (!ext4_has_feature_filetype(sb) || filetype >= EXT4_FT_MAX)
 169 +       int fl_index = filetype & EXT4_FT_MASK;
 170 +
 171 +       if (!ext4_has_feature_filetype(sb) || fl_index >= EXT4_FT_MAX)
 172                 return DT_UNKNOWN;
 173
 174 -       return ext4_filetype_table[filetype];
 175 +       if (!test_opt(sb, DIRDATA))
 176 +               return ext4_filetype_table[fl_index];
 177 +
 178 +       return (ext4_filetype_table[fl_index]) |
 179 +               (filetype & EXT4_DIRENT_LUFID);
 180 +
 181  }
 182  extern int ext4_check_all_de(struct inode *dir, struct buffer_head *bh,
 183                              void *buf, int buf_size);
 184 @@ -2525,6 +2575,8 @@ extern struct inode *ext4_create_inode(h
 185  extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
 186                              struct ext4_dir_entry_2 *de_del,
 187                              struct buffer_head *bh);
 188 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 189 +                              struct inode *inode, const void *, const void *);
 190  extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
 191                                 __u32 start_minor_hash, __u32 *next_hash);
 192  extern int ext4_search_dir(struct buffer_head *bh,
 193 @@ -3265,6 +3317,28 @@ static inline void ext4_clear_io_unwritt
 194
 195  extern const struct iomap_ops ext4_iomap_ops;
 196
 197 +/*
 198 + * Compute the total directory entry data length.
 199 + * This includes the filename and an implicit NUL terminator (always present),
 200 + * and optional extensions.  Each extension has a bit set in the high 4 bits of
 201 + * de->file_type, and the extension length is the first byte in each entry.
 202 + */
 203 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
 204 +{
 205 +       char *len = de->name + de->name_len + 1 /* NUL terminator */;
 206 +       int dlen = 0;
 207 +       __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
 208 +
 209 +       while (extra_data_flags) {
 210 +               if (extra_data_flags & 1) {
 211 +                       dlen += *len + (dlen == 0);
 212 +                       len += *len;
 213 +               }
 214 +               extra_data_flags >>= 1;
 215 +       }
 216 +       return dlen;
 217 +}
 218 +
 219  #endif /* __KERNEL__ */
 220
 221  #define EFSBADCRC      EBADMSG         /* Bad CRC detected */
 222 Index: linux-4.15.0/fs/ext4/namei.c
 223 ===================================================================
 224 --- linux-4.15.0.orig/fs/ext4/namei.c
 225 +++ linux-4.15.0/fs/ext4/namei.c
 226 @@ -242,7 +242,8 @@ static unsigned dx_get_count(struct dx_e
 227  static unsigned dx_get_limit(struct dx_entry *entries);
 228  static void dx_set_count(struct dx_entry *entries, unsigned value);
 229  static void dx_set_limit(struct dx_entry *entries, unsigned value);
 230 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
 231 +static inline unsigned dx_root_limit(struct inode *dir,
 232 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize);
 233  static unsigned dx_node_limit(struct inode *dir);
 234  static struct dx_frame *dx_probe(struct ext4_filename *fname,
 235                                  struct inode *dir,
 236 @@ -505,11 +506,12 @@ ext4_next_entry(struct ext4_dir_entry_2
 237   */
 238  struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
 239  {
 240 +       BUG_ON(de->name_len != 1);
 241         /* get dotdot first */
 242 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
 243 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 244
 245         /* dx root info is after dotdot entry */
 246 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
 247 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 248
 249         return (struct dx_root_info *)de;
 250  }
 251 @@ -554,10 +556,16 @@ static inline void dx_set_limit(struct d
 252         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
 253  }
 254
 255 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
 256 +static inline unsigned dx_root_limit(struct inode *dir,
 257 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize)
 258  {
 259 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
 260 -               EXT4_DIR_REC_LEN(2) - infosize;
 261 +       struct ext4_dir_entry_2 *dotdot_de;
 262 +       unsigned entry_space;
 263 +
 264 +       BUG_ON(dot_de->name_len != 1);
 265 +       dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
 266 +       entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
 267 +                        EXT4_DIR_REC_LEN(dotdot_de) - infosize;
 268
 269         if (ext4_has_metadata_csum(dir->i_sb))
 270                 entry_space -= sizeof(struct dx_tail);
 271 @@ -566,7 +574,7 @@ static inline unsigned dx_root_limit(str
 272
 273  static inline unsigned dx_node_limit(struct inode *dir)
 274  {
 275 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
 276 +       unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
 277
 278         if (ext4_has_metadata_csum(dir->i_sb))
 279                 entry_space -= sizeof(struct dx_tail);
 280 @@ -678,7 +686,7 @@ static struct stats dx_show_leaf(struct
 281                                        (unsigned) ((char *) de - base));
 282  #endif
 283                         }
 284 -                       space += EXT4_DIR_REC_LEN(de->name_len);
 285 +                       space += EXT4_DIR_REC_LEN(de);
 286                         names++;
 287                 }
 288                 de = ext4_next_entry(de, size);
 289 @@ -785,11 +793,14 @@ dx_probe(struct ext4_filename *fname, st
 290
 291         entries = (struct dx_entry *)(((char *)info) + info->info_length);
 292
 293 -       if (dx_get_limit(entries) != dx_root_limit(dir,
 294 -                                                  info->info_length)) {
 295 +       if (dx_get_limit(entries) !=
 296 +           dx_root_limit(dir, (struct ext4_dir_entry_2 *)frame->bh->b_data,
 297 +                         info->info_length)) {
 298                 ext4_warning_inode(dir, "dx entry: limit %u != root limit %u",
 299                                    dx_get_limit(entries),
 300 -                                  dx_root_limit(dir, info->info_length));
 301 +                                  dx_root_limit(dir,
 302 +                                         (struct ext4_dir_entry_2 *)frame->bh->b_data,
 303 +                                         info->info_length));
 304                 goto fail;
 305         }
 306
 307 @@ -981,7 +992,7 @@ static int htree_dirblock_to_tree(struct
 308         de = (struct ext4_dir_entry_2 *) bh->b_data;
 309         top = (struct ext4_dir_entry_2 *) ((char *) de +
 310                                            dir->i_sb->s_blocksize -
 311 -                                          EXT4_DIR_REC_LEN(0));
 312 +                                          __EXT4_DIR_REC_LEN(0));
 313  #ifdef CONFIG_EXT4_FS_ENCRYPTION
 314         /* Check if the directory is encrypted */
 315         if (ext4_encrypted_inode(dir)) {
 316 @@ -1653,7 +1664,7 @@ dx_move_dirents(char *from, char *to, st
 317         while (count--) {
 318                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 319                                                 (from + (map->offs<<2));
 320 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 321 +               rec_len = EXT4_DIR_REC_LEN(de);
 322                 memcpy (to, de, rec_len);
 323                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 324                                 ext4_rec_len_to_disk(rec_len, blocksize);
 325 @@ -1677,7 +1688,7 @@ static struct ext4_dir_entry_2* dx_pack_
 326         while ((char*)de < base + blocksize) {
 327                 next = ext4_next_entry(de, blocksize);
 328                 if (de->inode && de->name_len) {
 329 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 330 +                       rec_len = EXT4_DIR_REC_LEN(de);
 331                         if (de > to)
 332                                 memmove(to, de, rec_len);
 333                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 334 @@ -1808,14 +1819,16 @@ int ext4_find_dest_de(struct inode *dir,
 335                       struct buffer_head *bh,
 336                       void *buf, int buf_size,
 337                       struct ext4_filename *fname,
 338 -                     struct ext4_dir_entry_2 **dest_de)
 339 +                     struct ext4_dir_entry_2 **dest_de, int *dlen)
 340  {
 341         struct ext4_dir_entry_2 *de;
 342 -       unsigned short reclen = EXT4_DIR_REC_LEN(fname_len(fname));
 343 +       unsigned short reclen = __EXT4_DIR_REC_LEN(fname_len(fname)) +
 344 +                                                 (dlen ? *dlen : 0);
 345         int nlen, rlen;
 346         unsigned int offset = 0;
 347         char *top;
 348
 349 +       dlen ? *dlen = 0 : 0; /* default set to 0 */
 350         de = (struct ext4_dir_entry_2 *)buf;
 351         top = buf + buf_size - reclen;
 352         while ((char *) de <= top) {
 353 @@ -1824,10 +1837,26 @@ int ext4_find_dest_de(struct inode *dir,
 354                         return -EFSCORRUPTED;
 355                 if (ext4_match(fname, de))
 356                         return -EEXIST;
 357 -               nlen = EXT4_DIR_REC_LEN(de->name_len);
 358 +               nlen = EXT4_DIR_REC_LEN(de);
 359                 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 360                 if ((de->inode ? rlen - nlen : rlen) >= reclen)
 361                         break;
 362 +               /* Then for dotdot entries, check for the smaller space
 363 +                * required for just the entry, no FID */
 364 +               if (fname_len(fname) == 2 && memcmp(fname_name(fname), "..", 2) == 0) {
 365 +                       if ((de->inode ? rlen - nlen : rlen) >=
 366 +                           __EXT4_DIR_REC_LEN(fname_len(fname))) {
 367 +                               /* set dlen=1 to indicate not
 368 +                                * enough space store fid */
 369 +                               dlen ? *dlen = 1 : 0;
 370 +                               break;
 371 +                       }
 372 +                       /* The new ".." entry must be written over the
 373 +                        * previous ".." entry, which is the first
 374 +                        * entry traversed by this scan. If it doesn't
 375 +                        * fit, something is badly wrong, so -EIO. */
 376 +                       return -EIO;
 377 +               }
 378                 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
 379                 offset += rlen;
 380         }
 381 @@ -1841,12 +1870,12 @@ int ext4_find_dest_de(struct inode *dir,
 382  void ext4_insert_dentry(struct inode *inode,
 383                         struct ext4_dir_entry_2 *de,
 384                         int buf_size,
 385 -                       struct ext4_filename *fname)
 386 +                       struct ext4_filename *fname, void *data)
 387  {
 388
 389         int nlen, rlen;
 390
 391 -       nlen = EXT4_DIR_REC_LEN(de->name_len);
 392 +       nlen = EXT4_DIR_REC_LEN(de);
 393         rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 394         if (de->inode) {
 395                 struct ext4_dir_entry_2 *de1 =
 396 @@ -1860,6 +1889,11 @@ void ext4_insert_dentry(struct inode *in
 397         ext4_set_de_type(inode->i_sb, de, inode->i_mode);
 398         de->name_len = fname_len(fname);
 399         memcpy(de->name, fname_name(fname), fname_len(fname));
 400 +       if (data) {
 401 +               de->name[fname_len(fname)] = 0;
 402 +               memcpy(&de->name[fname_len(fname) + 1], data, *(char *)data);
 403 +               de->file_type |= EXT4_DIRENT_LUFID;
 404 +       }
 405  }
 406
 407  /*
 408 @@ -1877,14 +1911,19 @@ static int add_dirent_to_buf(handle_t *h
 409  {
 410         unsigned int    blocksize = dir->i_sb->s_blocksize;
 411         int             csum_size = 0;
 412 -       int             err;
 413 +       int             err, dlen = 0;
 414 +       unsigned char   *data;
 415
 416 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 417 +                                               EXT4_I(inode)->i_dirdata);
 418         if (ext4_has_metadata_csum(inode->i_sb))
 419                 csum_size = sizeof(struct ext4_dir_entry_tail);
 420
 421         if (!de) {
 422 +               if (data)
 423 +                       dlen = (*data) + 1;
 424                 err = ext4_find_dest_de(dir, inode, bh, bh->b_data,
 425 -                                       blocksize - csum_size, fname, &de);
 426 +                                       blocksize - csum_size, fname, &de, &dlen);
 427                 if (err)
 428                         return err;
 429         }
 430 @@ -1896,7 +1935,10 @@ static int add_dirent_to_buf(handle_t *h
 431         }
 432
 433         /* By now the buffer is marked for journaling */
 434 -       ext4_insert_dentry(inode, de, blocksize, fname);
 435 +       /* If writing the short form of "dotdot", don't add the data section */
 436 +       if (dlen == 1)
 437 +               data = NULL;
 438 +       ext4_insert_dentry(inode, de, blocksize, fname, data);
 439
 440         /*
 441          * XXX shouldn't update any times until successful
 442 @@ -2005,7 +2047,8 @@ static int make_indexed_dir(handle_t *ha
 443
 444         dx_set_block(entries, 1);
 445         dx_set_count(entries, 1);
 446 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 447 +       dx_set_limit(entries, dx_root_limit(dir,
 448 +                                        dot_de, sizeof(*dx_info)));
 449
 450         /* Initialize as for dx_probe */
 451         fname->hinfo.hash_version = dx_info->hash_version;
 452 @@ -2055,6 +2098,8 @@ static int ext4_update_dotdot(handle_t *
 453         struct buffer_head *dir_block;
 454         struct ext4_dir_entry_2 *de;
 455         int len, journal = 0, err = 0;
 456 +       int dlen = 0;
 457 +       char *data;
 458
 459         if (IS_ERR(handle))
 460                 return PTR_ERR(handle);
 461 @@ -2072,19 +2117,24 @@ static int ext4_update_dotdot(handle_t *
 462         /* the first item must be "." */
 463         assert(de->name_len == 1 && de->name[0] == '.');
 464         len = le16_to_cpu(de->rec_len);
 465 -       assert(len >= EXT4_DIR_REC_LEN(1));
 466 -       if (len > EXT4_DIR_REC_LEN(1)) {
 467 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 468 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 469                 BUFFER_TRACE(dir_block, "get_write_access");
 470                 err = ext4_journal_get_write_access(handle, dir_block);
 471                 if (err)
 472                         goto out_journal;
 473
 474                 journal = 1;
 475 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 476 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 477         }
 478
 479 -       len -= EXT4_DIR_REC_LEN(1);
 480 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 481 +       len -= EXT4_DIR_REC_LEN(de);
 482 +       data = ext4_dentry_get_data(dir->i_sb,
 483 +                       (struct ext4_dentry_param *)dentry->d_fsdata);
 484 +       if (data)
 485 +               dlen = *data + 1;
 486 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 487 +
 488         de = (struct ext4_dir_entry_2 *)
 489                         ((char *) de + le16_to_cpu(de->rec_len));
 490         if (!journal) {
 491 @@ -2098,10 +2148,15 @@ static int ext4_update_dotdot(handle_t *
 492         if (len > 0)
 493                 de->rec_len = cpu_to_le16(len);
 494         else
 495 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 496 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 497         de->name_len = 2;
 498         strcpy(de->name, "..");
 499 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 500 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 501 +               de->name[2] = 0;
 502 +               memcpy(&de->name[2 + 1], data, *data);
 503 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 504 +               de->file_type |= EXT4_DIRENT_LUFID;
 505 +       }
 506
 507  out_journal:
 508         if (journal) {
 509 @@ -2140,6 +2195,7 @@ static int ext4_add_entry(handle_t *hand
 510         ext4_lblk_t block, blocks;
 511         int     csum_size = 0;
 512
 513 +       EXT4_I(inode)->i_dirdata = dentry->d_fsdata;
 514         if (ext4_has_metadata_csum(inode->i_sb))
 515                 csum_size = sizeof(struct ext4_dir_entry_tail);
 516
 517 @@ -2661,37 +2717,70 @@ err_unlock_inode:
 518         return err;
 519  }
 520
 521 +struct tp_block {
 522 +       struct inode *inode;
 523 +       void *data1;
 524 +       void *data2;
 525 +};
 526 +
 527  struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
 528                           struct ext4_dir_entry_2 *de,
 529                           int blocksize, int csum_size,
 530                           unsigned int parent_ino, int dotdot_real_len)
 531  {
 532 +       void *data1 = NULL, *data2 = NULL;
 533 +       int dot_reclen = 0;
 534 +
 535 +       if (dotdot_real_len == 10) {
 536 +               struct tp_block *tpb = (struct tp_block *)inode;
 537 +               data1 = tpb->data1;
 538 +               data2 = tpb->data2;
 539 +               inode = tpb->inode;
 540 +               dotdot_real_len = 0;
 541 +       }
 542         de->inode = cpu_to_le32(inode->i_ino);
 543         de->name_len = 1;
 544 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 545 -                                          blocksize);
 546         strcpy(de->name, ".");
 547         ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 548
 549 +       /* get packed fid data*/
 550 +       data1 = ext4_dentry_get_data(inode->i_sb,
 551 +                               (struct ext4_dentry_param *) data1);
 552 +       if (data1) {
 553 +               de->name[1] = 0;
 554 +               memcpy(&de->name[2], data1, *(char *) data1);
 555 +               de->file_type |= EXT4_DIRENT_LUFID;
 556 +       }
 557 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 558 +       dot_reclen = cpu_to_le16(de->rec_len);
 559         de = ext4_next_entry(de, blocksize);
 560         de->inode = cpu_to_le32(parent_ino);
 561         de->name_len = 2;
 562 +       strcpy(de->name, "..");
 563 +       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 564 +       data2 = ext4_dentry_get_data(inode->i_sb,
 565 +                       (struct ext4_dentry_param *) data2);
 566 +       if (data2) {
 567 +               de->name[2] = 0;
 568 +               memcpy(&de->name[3], data2, *(char *) data2);
 569 +               de->file_type |= EXT4_DIRENT_LUFID;
 570 +       }
 571         if (!dotdot_real_len)
 572                 de->rec_len = ext4_rec_len_to_disk(blocksize -
 573 -                                       (csum_size + EXT4_DIR_REC_LEN(1)),
 574 +                                       (csum_size + dot_reclen),
 575                                         blocksize);
 576         else
 577                 de->rec_len = ext4_rec_len_to_disk(
 578 -                               EXT4_DIR_REC_LEN(de->name_len), blocksize);
 579 -       strcpy(de->name, "..");
 580 -       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 581 +                               EXT4_DIR_REC_LEN(de), blocksize);
 582
 583         return ext4_next_entry(de, blocksize);
 584  }
 585
 586  static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 587 -                            struct inode *inode)
 588 +                            struct inode *inode,
 589 +                            const void *data1, const void *data2)
 590  {
 591 +       struct tp_block param;
 592         struct buffer_head *dir_block = NULL;
 593         struct ext4_dir_entry_2 *de;
 594         struct ext4_dir_entry_tail *t;
 595 @@ -2716,7 +2805,11 @@ static int ext4_init_new_dir(handle_t *h
 596         if (IS_ERR(dir_block))
 597                 return PTR_ERR(dir_block);
 598         de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 599 -       ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 600 +       param.inode = inode;
 601 +       param.data1 = (void *)data1;
 602 +       param.data2 = (void *)data2;
 603 +       ext4_init_dot_dotdot((struct inode *)(&param), de, blocksize,
 604 +                            csum_size, dir->i_ino, 10);
 605         set_nlink(inode, 2);
 606         if (csum_size) {
 607                 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
 608 @@ -2733,6 +2826,29 @@ out:
 609         return err;
 610  }
 611
 612 +/* Initialize @inode as a subdirectory of @dir, and add the
 613 + * "." and ".." entries into the first directory block. */
 614 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 615 +                       struct inode *inode,
 616 +                       const void *data1, const void *data2)
 617 +{
 618 +       int rc;
 619 +
 620 +       if (IS_ERR(handle))
 621 +               return PTR_ERR(handle);
 622 +
 623 +       if (IS_DIRSYNC(dir))
 624 +               ext4_handle_sync(handle);
 625 +
 626 +       inode->i_op = &ext4_dir_inode_operations;
 627 +       inode->i_fop = &ext4_dir_operations;
 628 +       rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
 629 +       if (!rc)
 630 +               rc = ext4_mark_inode_dirty(handle, inode);
 631 +       return rc;
 632 +}
 633 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 634 +
 635  static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 636  {
 637         handle_t *handle;
 638 @@ -2759,7 +2875,7 @@ retry:
 639
 640         inode->i_op = &ext4_dir_inode_operations;
 641         inode->i_fop = &ext4_dir_operations;
 642 -       err = ext4_init_new_dir(handle, dir, inode);
 643 +       err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
 644         if (err)
 645                 goto out_clear_inode;
 646         err = ext4_mark_inode_dirty(handle, inode);
 647 @@ -2811,7 +2927,7 @@ bool ext4_empty_dir(struct inode *inode)
 648         }
 649
 650         sb = inode->i_sb;
 651 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
 652 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
 653                 EXT4_ERROR_INODE(inode, "invalid size");
 654                 return true;
 655         }
 656 Index: linux-4.15.0/fs/ext4/inline.c
 657 ===================================================================
 658 --- linux-4.15.0.orig/fs/ext4/inline.c
 659 +++ linux-4.15.0/fs/ext4/inline.c
 660 @@ -1017,7 +1017,7 @@ static int ext4_add_dirent_to_inline(han
 661         struct ext4_dir_entry_2 *de;
 662
 663         err = ext4_find_dest_de(dir, inode, iloc->bh, inline_start,
 664 -                               inline_size, fname, &de);
 665 +                               inline_size, fname, &de, NULL);
 666         if (err)
 667                 return err;
 668
 669 @@ -1025,7 +1025,7 @@ static int ext4_add_dirent_to_inline(han
 670         err = ext4_journal_get_write_access(handle, iloc->bh);
 671         if (err)
 672                 return err;
 673 -       ext4_insert_dentry(inode, de, inline_size, fname);
 674 +       ext4_insert_dentry(inode, de, inline_size, fname, NULL);
 675
 676         ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
 677
 678 @@ -1094,7 +1094,7 @@ static int ext4_update_inline_dir(handle
 679         int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
 680         int new_size = get_max_inline_xattr_value_size(dir, iloc);
 681
 682 -       if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
 683 +       if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
 684                 return -ENOSPC;
 685
 686         ret = ext4_update_inline_data(handle, dir,
 687 @@ -1375,7 +1375,7 @@ int htree_inlinedir_to_tree(struct file
 688                         fake.name_len = 1;
 689                         strcpy(fake.name, ".");
 690                         fake.rec_len = ext4_rec_len_to_disk(
 691 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 692 +                                               EXT4_DIR_REC_LEN(&fake),
 693                                                 inline_size);
 694                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 695                         de = &fake;
 696 @@ -1385,7 +1385,7 @@ int htree_inlinedir_to_tree(struct file
 697                         fake.name_len = 2;
 698                         strcpy(fake.name, "..");
 699                         fake.rec_len = ext4_rec_len_to_disk(
 700 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 701 +                                               EXT4_DIR_REC_LEN(&fake),
 702                                                 inline_size);
 703                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 704                         de = &fake;
 705 @@ -1483,8 +1483,8 @@ int ext4_read_inline_dir(struct file *fi
 706          * So we will use extra_offset and extra_size to indicate them
 707          * during the inline dir iteration.
 708          */
 709 -       dotdot_offset = EXT4_DIR_REC_LEN(1);
 710 -       dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
 711 +       dotdot_offset = __EXT4_DIR_REC_LEN(1);
 712 +       dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
 713         extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
 714         extra_size = extra_offset + inline_size;
 715
 716 @@ -1519,7 +1519,7 @@ int ext4_read_inline_dir(struct file *fi
 717                          * failure will be detected in the
 718                          * dirent test below. */
 719                         if (ext4_rec_len_from_disk(de->rec_len, extra_size)
 720 -                               < EXT4_DIR_REC_LEN(1))
 721 +                               < __EXT4_DIR_REC_LEN(1))
 722                                 break;
 723                         i += ext4_rec_len_from_disk(de->rec_len,
 724                                                     extra_size);
 725 Index: linux-4.15.0/fs/ext4/super.c
 726 ===================================================================
 727 --- linux-4.15.0.orig/fs/ext4/super.c
 728 +++ linux-4.15.0/fs/ext4/super.c
 729 @@ -1347,7 +1347,7 @@ enum {
 730         Opt_data_err_abort, Opt_data_err_ignore, Opt_test_dummy_encryption,
 731         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 732         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 733 -       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 734 +       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
 735         Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_dax,
 736         Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 737         Opt_lazytime, Opt_nolazytime, Opt_debug_want_extra_isize,
 738 @@ -1420,6 +1420,7 @@ static const match_table_t tokens = {
 739         {Opt_nolazytime, "nolazytime"},
 740         {Opt_debug_want_extra_isize, "debug_want_extra_isize=%u"},
 741         {Opt_nodelalloc, "nodelalloc"},
 742 +       {Opt_dirdata, "dirdata"},
 743         {Opt_removed, "mblk_io_submit"},
 744         {Opt_removed, "nomblk_io_submit"},
 745         {Opt_block_validity, "block_validity"},
 746 @@ -1641,6 +1642,7 @@ static const struct mount_opts {
 747         {Opt_usrjquota, 0, MOPT_Q},
 748         {Opt_grpjquota, 0, MOPT_Q},
 749         {Opt_offusrjquota, 0, MOPT_Q},
 750 +       {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
 751         {Opt_offgrpjquota, 0, MOPT_Q},
 752         {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
 753         {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},