ldiskfs/kernel_patches/patches/rhel7.3/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-stage/fs/ext4/dir.c
  11 ===================================================================
  12 --- linux-stage.orig/fs/ext4/dir.c
  13 +++ linux-stage/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) + dirent->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) + dirent->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, dirent->name, dirent->name_len);
  61 +       memcpy(new_fn->name, dirent->name, dirent->name_len + extra_data);
  62         new_fn->name[dirent->name_len] = 0;
  63
  64         while (*p) {
  65 @@ -635,7 +640,7 @@ int ext4_check_all_de(struct inode *dir,
  66                 if (ext4_check_dir_entry(dir, NULL, de, bh,
  67                                          buf, buf_size, offset))
  68                         return -EIO;
  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-stage/fs/ext4/ext4.h
  75 ===================================================================
  76 --- linux-stage.orig/fs/ext4/ext4.h
  77 +++ linux-stage/fs/ext4/ext4.h
  78 @@ -963,6 +963,7 @@ struct ext4_inode_info {
  79  /*
  80   * Mount flags set via mount options or defaults
  81   */
  82 +#define EXT4_MOUNT_DIRDATA             0x00002 /* Data in directory entries*/
  83  #define EXT4_MOUNT_GRPID               0x00004 /* Create files with directory's group */
  84  #define EXT4_MOUNT_DEBUG               0x00008 /* Some debugging messages */
  85  #define EXT4_MOUNT_ERRORS_CONT         0x00010 /* Continue on errors */
  86 @@ -1574,6 +1575,7 @@ static inline void ext4_clear_state_flag
  87                                          EXT4_FEATURE_INCOMPAT_64BIT| \
  88                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
  89                                          EXT4_FEATURE_INCOMPAT_MMP |    \
  90 +                                        EXT4_FEATURE_INCOMPAT_DIRDATA| \
  91                                          EXT4_FEATURE_INCOMPAT_INLINE_DATA)
  92  #define EXT4_FEATURE_RO_COMPAT_SUPP    (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
  93                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
  94 @@ -1680,6 +1682,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 @@ -1690,8 +1729,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 @@ -2016,11 +2058,11 @@ extern int ext4_find_dest_de(struct inod
 152                              struct buffer_head *bh,
 153                              void *buf, int buf_size,
 154                              const char *name, int namelen,
 155 -                            struct ext4_dir_entry_2 **dest_de);
 156 +                            struct ext4_dir_entry_2 **dest_de, int *dlen);
 157  void ext4_insert_dentry(struct inode *inode,
 158                         struct ext4_dir_entry_2 *de,
 159                         int buf_size,
 160 -                       const char *name, int namelen);
 161 +                       const char *name, int namelen, void *data);
 162  static inline void ext4_update_dx_flag(struct inode *inode)
 163  {
 164         if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
 165 @@ -2033,11 +2075,18 @@ static unsigned char ext4_filetype_table
 166
 167  static inline  unsigned char get_dtype(struct super_block *sb, int filetype)
 168  {
 169 +       int fl_index = filetype & EXT4_FT_MASK;
 170 +
 171         if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) ||
 172 -           (filetype >= EXT4_FT_MAX))
 173 +           (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  extern int ext4_check_all_de(struct inode *dir, struct buffer_head *bh,
 185                              void *buf, int buf_size);
 186 @@ -2186,6 +2235,8 @@ extern struct inode *ext4_create_inode(h
 187  extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
 188                              struct ext4_dir_entry_2 *de_del,
 189                              struct buffer_head *bh);
 190 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 191 +                              struct inode *inode, const void *, const void *);
 192  extern int search_dir(struct buffer_head *bh,
 193                       char *search_buf,
 194                       int buf_size,
 195 @@ -2865,6 +2916,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-stage/fs/ext4/namei.c
 225 ===================================================================
 226 --- linux-stage.orig/fs/ext4/namei.c
 227 +++ linux-stage/fs/ext4/namei.c
 228 @@ -239,7 +239,8 @@ static unsigned dx_get_count(struct dx_e
 229  static unsigned dx_get_limit(struct dx_entry *entries);
 230  static void dx_set_count(struct dx_entry *entries, unsigned value);
 231  static void dx_set_limit(struct dx_entry *entries, unsigned value);
 232 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
 233 +static inline unsigned dx_root_limit(struct inode *dir,
 234 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize);
 235  static unsigned dx_node_limit(struct inode *dir);
 236  static struct dx_frame *dx_probe(const struct qstr *d_name,
 237                                  struct inode *dir,
 238 @@ -500,11 +501,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 @@ -549,10 +551,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 @@ -561,7 +569,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 @@ -611,7 +619,7 @@ static struct stats dx_show_leaf(struct
 283                                 printk(":%x.%u ", h.hash,
 284                                        (unsigned) ((char *) de - base));
 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 @@ -719,12 +727,15 @@ dx_probe(const struct qstr *d_name, stru
 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 *)bh->b_data,
 299 +                         info->info_length)) {
 300                 ext4_warning(dir->i_sb, "dx entry: limit != root limit "
 301                              "inode #%lu: dx entry: limit %u != root limit %u",
 302                              dir->i_ino, dx_get_limit(entries),
 303 -                            dx_root_limit(dir, info->info_length));
 304 +                            dx_root_limit(dir,
 305 +                                         (struct ext4_dir_entry_2 *)bh->b_data,
 306 +                                         info->info_length));
 307                 brelse(bh);
 308                 *err = ERR_BAD_DX_DIR;
 309                 goto fail;
 310 @@ -916,7 +927,7 @@ static int htree_dirblock_to_tree(struct
 311         de = (struct ext4_dir_entry_2 *) bh->b_data;
 312         top = (struct ext4_dir_entry_2 *) ((char *) de +
 313                                            dir->i_sb->s_blocksize -
 314 -                                          EXT4_DIR_REC_LEN(0));
 315 +                                          __EXT4_DIR_REC_LEN(0));
 316         for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
 317                 if (ext4_check_dir_entry(dir, NULL, de, bh,
 318                                 bh->b_data, bh->b_size,
 319 @@ -1520,7 +1531,7 @@ dx_move_dirents(char *from, char *to, st
 320         while (count--) {
 321                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 322                                                 (from + (map->offs<<2));
 323 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 324 +               rec_len = EXT4_DIR_REC_LEN(de);
 325                 memcpy (to, de, rec_len);
 326                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 327                                 ext4_rec_len_to_disk(rec_len, blocksize);
 328 @@ -1544,7 +1555,7 @@ static struct ext4_dir_entry_2* dx_pack_
 329         while ((char*)de < base + blocksize) {
 330                 next = ext4_next_entry(de, blocksize);
 331                 if (de->inode && de->name_len) {
 332 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 333 +                       rec_len = EXT4_DIR_REC_LEN(de);
 334                         if (de > to)
 335                                 memmove(to, de, rec_len);
 336                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 337 @@ -1675,14 +1686,16 @@ int ext4_find_dest_de(struct inode *dir,
 338                       struct buffer_head *bh,
 339                       void *buf, int buf_size,
 340                       const char *name, int namelen,
 341 -                     struct ext4_dir_entry_2 **dest_de)
 342 +                     struct ext4_dir_entry_2 **dest_de, int *dlen)
 343  {
 344         struct ext4_dir_entry_2 *de;
 345 -       unsigned short reclen = EXT4_DIR_REC_LEN(namelen);
 346 +       unsigned short reclen = __EXT4_DIR_REC_LEN(namelen) +
 347 +                                                       (dlen ? *dlen : 0);
 348         int nlen, rlen;
 349         unsigned int offset = 0;
 350         char *top;
 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 @@ -1691,10 +1704,26 @@ int ext4_find_dest_de(struct inode *dir,
 357                         return -EIO;
 358                 if (ext4_match(namelen, name, de))
 359                         return -EEXIST;
 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 (namelen == 2 && memcmp(name, "..", 2) == 0) {
 368 +                       if ((de->inode ? rlen - nlen : rlen) >=
 369 +                           __EXT4_DIR_REC_LEN(namelen)) {
 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 @@ -1708,12 +1737,12 @@ int ext4_find_dest_de(struct inode *dir,
 385  void ext4_insert_dentry(struct inode *inode,
 386                         struct ext4_dir_entry_2 *de,
 387                         int buf_size,
 388 -                       const char *name, int namelen)
 389 +                       const char *name, int namelen, 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 @@ -1727,6 +1756,11 @@ void ext4_insert_dentry(struct inode *in
 400         ext4_set_de_type(inode->i_sb, de, inode->i_mode);
 401         de->name_len = namelen;
 402         memcpy(de->name, name, namelen);
 403 +       if (data) {
 404 +               de->name[namelen] = 0;
 405 +               memcpy(&de->name[namelen + 1], data, *(char *)data);
 406 +               de->file_type |= EXT4_DIRENT_LUFID;
 407 +       }
 408  }
 409  /*
 410   * Add a new entry into a directory (leaf) block.  If de is non-NULL,
 411 @@ -1745,15 +1779,20 @@ static int add_dirent_to_buf(handle_t *h
 412         int             namelen = dentry->d_name.len;
 413         unsigned int    blocksize = dir->i_sb->s_blocksize;
 414         int             csum_size = 0;
 415 -       int             err;
 416 +       int             err, dlen = 0;
 417 +       unsigned char   *data;
 418
 419 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 420 +                                               dentry->d_fsdata);
 421         if (ext4_has_metadata_csum(inode->i_sb))
 422                 csum_size = sizeof(struct ext4_dir_entry_tail);
 423
 424         if (!de) {
 425 +               if (data)
 426 +                       dlen = (*data) + 1;
 427                 err = ext4_find_dest_de(dir, inode,
 428                                         bh, bh->b_data, blocksize - csum_size,
 429 -                                       name, namelen, &de);
 430 +                                       name, namelen, &de, &dlen);
 431                 if (err)
 432                         return err;
 433         }
 434 @@ -1765,7 +1804,10 @@ static int add_dirent_to_buf(handle_t *h
 435         }
 436
 437         /* By now the buffer is marked for journaling */
 438 -       ext4_insert_dentry(inode, de, blocksize, name, namelen);
 439 +       /* If writing the short form of "dotdot", don't add the data section */
 440 +       if (dlen == 1)
 441 +               data = NULL;
 442 +       ext4_insert_dentry(inode, de, blocksize, name, namelen, data);
 443
 444         /*
 445          * XXX shouldn't update any times until successful
 446 @@ -1877,7 +1919,8 @@ static int make_indexed_dir(handle_t *ha
 447
 448         dx_set_block(entries, 1);
 449         dx_set_count(entries, 1);
 450 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 451 +       dx_set_limit(entries, dx_root_limit(dir,
 452 +                                        dot_de, sizeof(*dx_info)));
 453
 454         /* Initialize as for dx_probe */
 455         hinfo.hash_version = dx_info->hash_version;
 456 @@ -1927,6 +1970,8 @@ static int ext4_update_dotdot(handle_t *
 457         struct buffer_head *dir_block;
 458         struct ext4_dir_entry_2 *de;
 459         int len, journal = 0, err = 0;
 460 +       int dlen = 0;
 461 +       char *data;
 462
 463         if (IS_ERR(handle))
 464                 return PTR_ERR(handle);
 465 @@ -1942,19 +1987,24 @@ static int ext4_update_dotdot(handle_t *
 466         /* the first item must be "." */
 467         assert(de->name_len == 1 && de->name[0] == '.');
 468         len = le16_to_cpu(de->rec_len);
 469 -       assert(len >= EXT4_DIR_REC_LEN(1));
 470 -       if (len > EXT4_DIR_REC_LEN(1)) {
 471 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 472 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 473                 BUFFER_TRACE(dir_block, "get_write_access");
 474                 err = ext4_journal_get_write_access(handle, dir_block);
 475                 if (err)
 476                         goto out_journal;
 477
 478                 journal = 1;
 479 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 480 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 481         }
 482
 483 -       len -= EXT4_DIR_REC_LEN(1);
 484 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 485 +       len -= EXT4_DIR_REC_LEN(de);
 486 +       data = ext4_dentry_get_data(dir->i_sb,
 487 +                       (struct ext4_dentry_param *)dentry->d_fsdata);
 488 +       if (data)
 489 +               dlen = *data + 1;
 490 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 491 +
 492         de = (struct ext4_dir_entry_2 *)
 493                         ((char *) de + le16_to_cpu(de->rec_len));
 494         if (!journal) {
 495 @@ -1968,10 +2018,15 @@ static int ext4_update_dotdot(handle_t *
 496         if (len > 0)
 497                 de->rec_len = cpu_to_le16(len);
 498         else
 499 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 500 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 501         de->name_len = 2;
 502         strcpy(de->name, "..");
 503 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 504 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 505 +               de->name[2] = 0;
 506 +               memcpy(&de->name[2 + 1], data, *data);
 507 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 508 +               de->file_type |= EXT4_DIRENT_LUFID;
 509 +       }
 510
 511  out_journal:
 512         if (journal) {
 513 @@ -2445,37 +2500,70 @@ retry:
 514         return err;
 515  }
 516
 517 +struct tp_block {
 518 +       struct inode *inode;
 519 +       void *data1;
 520 +       void *data2;
 521 +};
 522 +
 523  struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
 524                           struct ext4_dir_entry_2 *de,
 525                           int blocksize, int csum_size,
 526                           unsigned int parent_ino, int dotdot_real_len)
 527  {
 528 +       void *data1 = NULL, *data2 = NULL;
 529 +       int dot_reclen = 0;
 530 +
 531 +       if (dotdot_real_len == 10) {
 532 +               struct tp_block *tpb = (struct tp_block *)inode;
 533 +               data1 = tpb->data1;
 534 +               data2 = tpb->data2;
 535 +               inode = tpb->inode;
 536 +               dotdot_real_len = 0;
 537 +       }
 538         de->inode = cpu_to_le32(inode->i_ino);
 539         de->name_len = 1;
 540 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 541 -                                          blocksize);
 542         strcpy(de->name, ".");
 543         ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 544
 545 +       /* get packed fid data*/
 546 +       data1 = ext4_dentry_get_data(inode->i_sb,
 547 +                               (struct ext4_dentry_param *) data1);
 548 +       if (data1) {
 549 +               de->name[1] = 0;
 550 +               memcpy(&de->name[2], data1, *(char *) data1);
 551 +               de->file_type |= EXT4_DIRENT_LUFID;
 552 +       }
 553 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 554 +       dot_reclen = cpu_to_le16(de->rec_len);
 555         de = ext4_next_entry(de, blocksize);
 556         de->inode = cpu_to_le32(parent_ino);
 557         de->name_len = 2;
 558 +       strcpy(de->name, "..");
 559 +       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 560 +       data2 = ext4_dentry_get_data(inode->i_sb,
 561 +                       (struct ext4_dentry_param *) data2);
 562 +       if (data2) {
 563 +               de->name[2] = 0;
 564 +               memcpy(&de->name[3], data2, *(char *) data2);
 565 +               de->file_type |= EXT4_DIRENT_LUFID;
 566 +       }
 567         if (!dotdot_real_len)
 568                 de->rec_len = ext4_rec_len_to_disk(blocksize -
 569 -                                       (csum_size + EXT4_DIR_REC_LEN(1)),
 570 +                                       (csum_size + dot_reclen),
 571                                         blocksize);
 572         else
 573                 de->rec_len = ext4_rec_len_to_disk(
 574 -                               EXT4_DIR_REC_LEN(de->name_len), blocksize);
 575 -       strcpy(de->name, "..");
 576 -       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 577 +                               EXT4_DIR_REC_LEN(de), blocksize);
 578
 579         return ext4_next_entry(de, blocksize);
 580  }
 581
 582  static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 583 -                            struct inode *inode)
 584 +                            struct inode *inode,
 585 +                            const void *data1, const void *data2)
 586  {
 587 +       struct tp_block param;
 588         struct buffer_head *dir_block = NULL;
 589         struct ext4_dir_entry_2 *de;
 590         struct ext4_dir_entry_tail *t;
 591 @@ -2500,7 +2588,11 @@ static int ext4_init_new_dir(handle_t *h
 592         if (IS_ERR(dir_block))
 593                 return PTR_ERR(dir_block);
 594         de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 595 -       ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 596 +       param.inode = inode;
 597 +       param.data1 = (void *)data1;
 598 +       param.data2 = (void *)data2;
 599 +       ext4_init_dot_dotdot((struct inode *)(&param), de, blocksize,
 600 +                            csum_size, dir->i_ino, 10);
 601         set_nlink(inode, 2);
 602         if (csum_size) {
 603                 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
 604 @@ -2517,6 +2609,29 @@ out:
 605         return err;
 606  }
 607
 608 +/* Initialize @inode as a subdirectory of @dir, and add the
 609 + * "." and ".." entries into the first directory block. */
 610 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 611 +                       struct inode *inode,
 612 +                       const void *data1, const void *data2)
 613 +{
 614 +       int rc;
 615 +
 616 +       if (IS_ERR(handle))
 617 +               return PTR_ERR(handle);
 618 +
 619 +       if (IS_DIRSYNC(dir))
 620 +               ext4_handle_sync(handle);
 621 +
 622 +       inode->i_op = &ext4_dir_inode_operations.ops;
 623 +       inode->i_fop = &ext4_dir_operations;
 624 +       rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
 625 +       if (!rc)
 626 +               rc = ext4_mark_inode_dirty(handle, inode);
 627 +       return rc;
 628 +}
 629 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 630 +
 631  static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 632  {
 633         handle_t *handle;
 634 @@ -2542,7 +2657,7 @@ retry:
 635         inode->i_op = &ext4_dir_inode_operations.ops;
 636         inode->i_fop = &ext4_dir_operations;
 637         inode->i_flags |= S_IOPS_WRAPPER;
 638 -       err = ext4_init_new_dir(handle, dir, inode);
 639 +       err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
 640         if (err)
 641                 goto out_clear_inode;
 642         err = ext4_mark_inode_dirty(handle, inode);
 643 @@ -2594,7 +2709,7 @@ static int empty_dir(struct inode *inode
 644         }
 645
 646         sb = inode->i_sb;
 647 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
 648 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
 649                 EXT4_ERROR_INODE(inode, "invalid size");
 650                 return 1;
 651         }
 652 Index: linux-stage/fs/ext4/inline.c
 653 ===================================================================
 654 --- linux-stage.orig/fs/ext4/inline.c
 655 +++ linux-stage/fs/ext4/inline.c
 656 @@ -1006,7 +1006,7 @@ static int ext4_add_dirent_to_inline(han
 657
 658         err = ext4_find_dest_de(dir, inode, iloc->bh,
 659                                 inline_start, inline_size,
 660 -                               name, namelen, &de);
 661 +                               name, namelen, &de, NULL);
 662         if (err)
 663                 return err;
 664
 665 @@ -1014,7 +1014,7 @@ static int ext4_add_dirent_to_inline(han
 666         err = ext4_journal_get_write_access(handle, iloc->bh);
 667         if (err)
 668                 return err;
 669 -       ext4_insert_dentry(inode, de, inline_size, name, namelen);
 670 +       ext4_insert_dentry(inode, de, inline_size, name, namelen, NULL);
 671
 672         ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
 673
 674 @@ -1084,7 +1084,7 @@ static int ext4_update_inline_dir(handle
 675         int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
 676         int new_size = get_max_inline_xattr_value_size(dir, iloc);
 677
 678 -       if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
 679 +       if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
 680                 return -ENOSPC;
 681
 682         ret = ext4_update_inline_data(handle, dir,
 683 @@ -1365,7 +1365,7 @@ int htree_inlinedir_to_tree(struct file
 684                         fake.name_len = 1;
 685                         strcpy(fake.name, ".");
 686                         fake.rec_len = ext4_rec_len_to_disk(
 687 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 688 +                                               EXT4_DIR_REC_LEN(&fake),
 689                                                 inline_size);
 690                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 691                         de = &fake;
 692 @@ -1375,7 +1375,7 @@ int htree_inlinedir_to_tree(struct file
 693                         fake.name_len = 2;
 694                         strcpy(fake.name, "..");
 695                         fake.rec_len = ext4_rec_len_to_disk(
 696 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 697 +                                               EXT4_DIR_REC_LEN(&fake),
 698                                                 inline_size);
 699                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 700                         de = &fake;
 701 @@ -1473,8 +1473,8 @@ int ext4_read_inline_dir(struct file *fi
 702          * So we will use extra_offset and extra_size to indicate them
 703          * during the inline dir iteration.
 704          */
 705 -       dotdot_offset = EXT4_DIR_REC_LEN(1);
 706 -       dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
 707 +       dotdot_offset = __EXT4_DIR_REC_LEN(1);
 708 +       dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
 709         extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
 710         extra_size = extra_offset + inline_size;
 711
 712 @@ -1511,7 +1511,7 @@ revalidate:
 713                                  * failure will be detected in the
 714                                  * dirent test below. */
 715                                 if (ext4_rec_len_from_disk(de->rec_len,
 716 -                                       extra_size) < EXT4_DIR_REC_LEN(1))
 717 +                                       extra_size) < __EXT4_DIR_REC_LEN(1))
 718                                         break;
 719                                 i += ext4_rec_len_from_disk(de->rec_len,
 720                                                             extra_size);
 721 Index: linux-stage/fs/ext4/super.c
 722 ===================================================================
 723 --- linux-stage.orig/fs/ext4/super.c
 724 +++ linux-stage/fs/ext4/super.c
 725 @@ -1155,7 +1155,7 @@ enum {
 726         Opt_data_err_abort, Opt_data_err_ignore,
 727         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 728         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 729 -       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 730 +       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
 731         Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
 732         Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 733         Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
 734 @@ -1223,6 +1223,7 @@ static const match_table_t tokens = {
 735         {Opt_stripe, "stripe=%u"},
 736         {Opt_delalloc, "delalloc"},
 737         {Opt_nodelalloc, "nodelalloc"},
 738 +       {Opt_dirdata, "dirdata"},
 739         {Opt_removed, "mblk_io_submit"},
 740         {Opt_removed, "nomblk_io_submit"},
 741         {Opt_block_validity, "block_validity"},
 742 @@ -1436,6 +1437,7 @@ static const struct mount_opts {
 743         {Opt_usrjquota, 0, MOPT_Q},
 744         {Opt_grpjquota, 0, MOPT_Q},
 745         {Opt_offusrjquota, 0, MOPT_Q},
 746 +       {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
 747         {Opt_offgrpjquota, 0, MOPT_Q},
 748         {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
 749         {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},