ldiskfs/kernel_patches/patches/sles12/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 @@ -70,11 +70,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 @@ -202,7 +202,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 @@ -421,12 +421,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 @@ -435,7 +440,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 Index: linux-stage/fs/ext4/ext4.h
  66 ===================================================================
  67 --- linux-stage.orig/fs/ext4/ext4.h
  68 +++ linux-stage/fs/ext4/ext4.h
  69 @@ -960,6 +960,7 @@ struct ext4_inode_info {
  70  #define EXT4_MOUNT_ERRORS_MASK         0x00070
  71  #define EXT4_MOUNT_MINIX_DF            0x00080 /* Mimics the Minix statfs */
  72  #define EXT4_MOUNT_NOLOAD              0x00100 /* Don't use existing journal*/
  73 +#define EXT4_MOUNT_DIRDATA             0x00200 /* Data in directory entries*/
  74  #define EXT4_MOUNT_DATA_FLAGS          0x00C00 /* Mode for data writes: */
  75  #define EXT4_MOUNT_JOURNAL_DATA                0x00400 /* Write data to journal */
  76  #define EXT4_MOUNT_ORDERED_DATA                0x00800 /* Flush data before commit */
  77 @@ -1538,6 +1539,7 @@ static inline void ext4_clear_state_flag
  78                                          EXT4_FEATURE_INCOMPAT_64BIT| \
  79                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
  80                                          EXT4_FEATURE_INCOMPAT_MMP |    \
  81 +                                        EXT4_FEATURE_INCOMPAT_DIRDATA| \
  82                                          EXT4_FEATURE_INCOMPAT_INLINE_DATA)
  83  #define EXT4_FEATURE_RO_COMPAT_SUPP    (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
  84                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
  85 @@ -1644,6 +1646,43 @@ struct ext4_dir_entry_tail {
  86  #define EXT4_FT_SYMLINK                7
  87
  88  #define EXT4_FT_MAX            8
  89 +#define EXT4_FT_MASK           0xf
  90 +
  91 +#if EXT4_FT_MAX > EXT4_FT_MASK
  92 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
  93 +#endif
  94 +
  95 +/*
  96 + * d_type has 4 unused bits, so it can hold four types data. these different
  97 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
  98 + * stored, in flag order, after file-name in ext4 dirent.
  99 +*/
 100 +/*
 101 + * this flag is added to d_type if ext4 dirent has extra data after
 102 + * filename. this data length is variable and length is stored in first byte
 103 + * of data. data start after filename NUL byte.
 104 + * This is used by Lustre FS.
 105 +  */
 106 +#define EXT4_DIRENT_LUFID              0x10
 107 +
 108 +#define EXT4_LUFID_MAGIC    0xAD200907UL
 109 +struct ext4_dentry_param {
 110 +       __u32  edp_magic;       /* EXT4_LUFID_MAGIC */
 111 +       char   edp_len;         /* size of edp_data in bytes */
 112 +       char   edp_data[0];     /* packed array of data */
 113 +} __packed;
 114 +
 115 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
 116 +                                                 struct ext4_dentry_param *p)
 117 +
 118 +{
 119 +       if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_DIRDATA))
 120 +               return NULL;
 121 +       if (p && p->edp_magic == EXT4_LUFID_MAGIC)
 122 +               return &p->edp_len;
 123 +       else
 124 +               return NULL;
 125 +}
 126
 127  #define EXT4_FT_DIR_CSUM       0xDE
 128
 129 @@ -1654,8 +1693,11 @@ struct ext4_dir_entry_tail {
 130   */
 131  #define EXT4_DIR_PAD                   4
 132  #define EXT4_DIR_ROUND                 (EXT4_DIR_PAD - 1)
 133 -#define EXT4_DIR_REC_LEN(name_len)     (((name_len) + 8 + EXT4_DIR_ROUND) & \
 134 +#define __EXT4_DIR_REC_LEN(name_len)   (((name_len) + 8 + EXT4_DIR_ROUND) & \
 135                                          ~EXT4_DIR_ROUND)
 136 +#define EXT4_DIR_REC_LEN(de)           (__EXT4_DIR_REC_LEN((de)->name_len +\
 137 +                                       ext4_get_dirent_data_len(de)))
 138 +
 139  #define EXT4_MAX_REC_LEN               ((1<<16)-1)
 140
 141  /*
 142 @@ -1991,11 +2033,11 @@ extern int ext4_find_dest_de(struct inod
 143                              struct buffer_head *bh,
 144                              void *buf, int buf_size,
 145                              const char *name, int namelen,
 146 -                            struct ext4_dir_entry_2 **dest_de);
 147 +                            struct ext4_dir_entry_2 **dest_de, int *dlen);
 148  void ext4_insert_dentry(struct inode *inode,
 149                         struct ext4_dir_entry_2 *de,
 150                         int buf_size,
 151 -                       const char *name, int namelen);
 152 +                       const char *name, int namelen, void *data);
 153  static inline void ext4_update_dx_flag(struct inode *inode)
 154  {
 155         if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
 156 @@ -2008,11 +2050,18 @@ static unsigned char ext4_filetype_table
 157
 158  static inline  unsigned char get_dtype(struct super_block *sb, int filetype)
 159  {
 160 +       int fl_index = filetype & EXT4_FT_MASK;
 161 +
 162         if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) ||
 163 -           (filetype >= EXT4_FT_MAX))
 164 +           (fl_index >= EXT4_FT_MAX))
 165                 return DT_UNKNOWN;
 166
 167 -       return ext4_filetype_table[filetype];
 168 +       if (!test_opt(sb, DIRDATA))
 169 +               return ext4_filetype_table[fl_index];
 170 +
 171 +       return (ext4_filetype_table[fl_index]) |
 172 +               (filetype & EXT4_DIRENT_LUFID);
 173 +
 174  }
 175
 176  /* fsync.c */
 177 @@ -2158,6 +2207,8 @@ extern struct inode *ext4_create_inode(h
 178  extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
 179                              struct ext4_dir_entry_2 *de_del,
 180                              struct buffer_head *bh);
 181 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 182 +                              struct inode *inode, const void *, const void *);
 183  extern int search_dir(struct buffer_head *bh,
 184                       char *search_buf,
 185                       int buf_size,
 186 @@ -2834,6 +2885,28 @@ extern struct mutex ext4__aio_mutex[EXT4
 187  extern int ext4_resize_begin(struct super_block *sb);
 188  extern void ext4_resize_end(struct super_block *sb);
 189
 190 +/*
 191 + * Compute the total directory entry data length.
 192 + * This includes the filename and an implicit NUL terminator (always present),
 193 + * and optional extensions.  Each extension has a bit set in the high 4 bits of
 194 + * de->file_type, and the extension length is the first byte in each entry.
 195 + */
 196 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
 197 +{
 198 +       char *len = de->name + de->name_len + 1 /* NUL terminator */;
 199 +       int dlen = 0;
 200 +       __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
 201 +
 202 +       while (extra_data_flags) {
 203 +               if (extra_data_flags & 1) {
 204 +                       dlen += *len + (dlen == 0);
 205 +                       len += *len;
 206 +               }
 207 +               extra_data_flags >>= 1;
 208 +       }
 209 +       return dlen;
 210 +}
 211 +
 212  #endif /* __KERNEL__ */
 213
 214  #endif /* _EXT4_H */
 215 Index: linux-stage/fs/ext4/namei.c
 216 ===================================================================
 217 --- linux-stage.orig/fs/ext4/namei.c
 218 +++ linux-stage/fs/ext4/namei.c
 219 @@ -239,7 +239,8 @@ static unsigned dx_get_count(struct dx_e
 220  static unsigned dx_get_limit(struct dx_entry *entries);
 221  static void dx_set_count(struct dx_entry *entries, unsigned value);
 222  static void dx_set_limit(struct dx_entry *entries, unsigned value);
 223 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
 224 +static inline unsigned dx_root_limit(struct inode *dir,
 225 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize);
 226  static unsigned dx_node_limit(struct inode *dir);
 227  static struct dx_frame *dx_probe(const struct qstr *d_name,
 228                                  struct inode *dir,
 229 @@ -500,11 +501,12 @@ ext4_next_entry(struct ext4_dir_entry_2
 230   */
 231  struct dx_root_info *dx_get_dx_info(struct ext4_dir_entry_2 *de)
 232  {
 233 +       BUG_ON(de->name_len != 1);
 234         /* get dotdot first */
 235 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
 236 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 237
 238         /* dx root info is after dotdot entry */
 239 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
 240 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 241
 242         return (struct dx_root_info *)de;
 243  }
 244 @@ -549,10 +551,16 @@ static inline void dx_set_limit(struct d
 245         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
 246  }
 247
 248 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
 249 +static inline unsigned dx_root_limit(struct inode *dir,
 250 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize)
 251  {
 252 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
 253 -               EXT4_DIR_REC_LEN(2) - infosize;
 254 +       struct ext4_dir_entry_2 *dotdot_de;
 255 +       unsigned entry_space;
 256 +
 257 +       BUG_ON(dot_de->name_len != 1);
 258 +       dotdot_de = ext4_next_entry(dot_de, dir->i_sb->s_blocksize);
 259 +       entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(dot_de) -
 260 +                        EXT4_DIR_REC_LEN(dotdot_de) - infosize;
 261
 262         if (ext4_has_metadata_csum(dir->i_sb))
 263                 entry_space -= sizeof(struct dx_tail);
 264 @@ -561,7 +569,7 @@ static inline unsigned dx_root_limit(str
 265
 266  static inline unsigned dx_node_limit(struct inode *dir)
 267  {
 268 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
 269 +       unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
 270
 271         if (ext4_has_metadata_csum(dir->i_sb))
 272                 entry_space -= sizeof(struct dx_tail);
 273 @@ -611,7 +619,7 @@ static struct stats dx_show_leaf(struct
 274                                 printk(":%x.%u ", h.hash,
 275                                        (unsigned) ((char *) de - base));
 276                         }
 277 -                       space += EXT4_DIR_REC_LEN(de->name_len);
 278 +                       space += EXT4_DIR_REC_LEN(de);
 279                         names++;
 280                 }
 281                 de = ext4_next_entry(de, size);
 282 @@ -719,12 +727,15 @@ dx_probe(const struct qstr *d_name, stru
 283
 284         entries = (struct dx_entry *)(((char *)info) + info->info_length);
 285
 286 -       if (dx_get_limit(entries) != dx_root_limit(dir,
 287 -                                                  info->info_length)) {
 288 +       if (dx_get_limit(entries) !=
 289 +           dx_root_limit(dir, (struct ext4_dir_entry_2 *)bh->b_data,
 290 +                         info->info_length)) {
 291                 ext4_warning(dir->i_sb, "dx entry: limit != root limit "
 292                              "inode #%lu: dx entry: limit %u != root limit %u",
 293                              dir->i_ino, dx_get_limit(entries),
 294 -                            dx_root_limit(dir, info->info_length));
 295 +                            dx_root_limit(dir,
 296 +                                         (struct ext4_dir_entry_2 *)bh->b_data,
 297 +                                         info->info_length));
 298                 brelse(bh);
 299                 *err = ERR_BAD_DX_DIR;
 300                 goto fail;
 301 @@ -916,7 +927,7 @@ static int htree_dirblock_to_tree(struct
 302         de = (struct ext4_dir_entry_2 *) bh->b_data;
 303         top = (struct ext4_dir_entry_2 *) ((char *) de +
 304                                            dir->i_sb->s_blocksize -
 305 -                                          EXT4_DIR_REC_LEN(0));
 306 +                                          __EXT4_DIR_REC_LEN(0));
 307         for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
 308                 if (ext4_check_dir_entry(dir, NULL, de, bh,
 309                                 bh->b_data, bh->b_size,
 310 @@ -1508,7 +1519,7 @@ dx_move_dirents(char *from, char *to, st
 311         while (count--) {
 312                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 313                                                 (from + (map->offs<<2));
 314 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 315 +               rec_len = EXT4_DIR_REC_LEN(de);
 316                 memcpy (to, de, rec_len);
 317                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 318                                 ext4_rec_len_to_disk(rec_len, blocksize);
 319 @@ -1532,7 +1543,7 @@ static struct ext4_dir_entry_2* dx_pack_
 320         while ((char*)de < base + blocksize) {
 321                 next = ext4_next_entry(de, blocksize);
 322                 if (de->inode && de->name_len) {
 323 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 324 +                       rec_len = EXT4_DIR_REC_LEN(de);
 325                         if (de > to)
 326                                 memmove(to, de, rec_len);
 327                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 328 @@ -1663,14 +1674,16 @@ int ext4_find_dest_de(struct inode *dir,
 329                       struct buffer_head *bh,
 330                       void *buf, int buf_size,
 331                       const char *name, int namelen,
 332 -                     struct ext4_dir_entry_2 **dest_de)
 333 +                     struct ext4_dir_entry_2 **dest_de, int *dlen)
 334  {
 335         struct ext4_dir_entry_2 *de;
 336 -       unsigned short reclen = EXT4_DIR_REC_LEN(namelen);
 337 +       unsigned short reclen = __EXT4_DIR_REC_LEN(namelen) +
 338 +                                                       (dlen ? *dlen : 0);
 339         int nlen, rlen;
 340         unsigned int offset = 0;
 341         char *top;
 342
 343 +       dlen ? *dlen = 0 : 0; /* default set to 0 */
 344         de = (struct ext4_dir_entry_2 *)buf;
 345         top = buf + buf_size - reclen;
 346         while ((char *) de <= top) {
 347 @@ -1679,10 +1692,26 @@ int ext4_find_dest_de(struct inode *dir,
 348                         return -EIO;
 349                 if (ext4_match(namelen, name, de))
 350                         return -EEXIST;
 351 -               nlen = EXT4_DIR_REC_LEN(de->name_len);
 352 +               nlen = EXT4_DIR_REC_LEN(de);
 353                 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 354                 if ((de->inode ? rlen - nlen : rlen) >= reclen)
 355                         break;
 356 +               /* Then for dotdot entries, check for the smaller space
 357 +                * required for just the entry, no FID */
 358 +               if (namelen == 2 && memcmp(name, "..", 2) == 0) {
 359 +                       if ((de->inode ? rlen - nlen : rlen) >=
 360 +                           __EXT4_DIR_REC_LEN(namelen)) {
 361 +                               /* set dlen=1 to indicate not
 362 +                                * enough space store fid */
 363 +                               dlen ? *dlen = 1 : 0;
 364 +                               break;
 365 +                       }
 366 +                       /* The new ".." entry must be written over the
 367 +                        * previous ".." entry, which is the first
 368 +                        * entry traversed by this scan. If it doesn't
 369 +                        * fit, something is badly wrong, so -EIO. */
 370 +                       return -EIO;
 371 +               }
 372                 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
 373                 offset += rlen;
 374         }
 375 @@ -1696,12 +1725,12 @@ int ext4_find_dest_de(struct inode *dir,
 376  void ext4_insert_dentry(struct inode *inode,
 377                         struct ext4_dir_entry_2 *de,
 378                         int buf_size,
 379 -                       const char *name, int namelen)
 380 +                       const char *name, int namelen, void *data)
 381  {
 382
 383         int nlen, rlen;
 384
 385 -       nlen = EXT4_DIR_REC_LEN(de->name_len);
 386 +       nlen = EXT4_DIR_REC_LEN(de);
 387         rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
 388         if (de->inode) {
 389                 struct ext4_dir_entry_2 *de1 =
 390 @@ -1715,6 +1744,11 @@ void ext4_insert_dentry(struct inode *in
 391         ext4_set_de_type(inode->i_sb, de, inode->i_mode);
 392         de->name_len = namelen;
 393         memcpy(de->name, name, namelen);
 394 +       if (data) {
 395 +               de->name[namelen] = 0;
 396 +               memcpy(&de->name[namelen + 1], data, *(char *)data);
 397 +               de->file_type |= EXT4_DIRENT_LUFID;
 398 +       }
 399  }
 400  /*
 401   * Add a new entry into a directory (leaf) block.  If de is non-NULL,
 402 @@ -1733,15 +1767,20 @@ static int add_dirent_to_buf(handle_t *h
 403         int             namelen = dentry->d_name.len;
 404         unsigned int    blocksize = dir->i_sb->s_blocksize;
 405         int             csum_size = 0;
 406 -       int             err;
 407 +       int             err, dlen = 0;
 408 +       unsigned char   *data;
 409
 410 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 411 +                                               dentry->d_fsdata);
 412         if (ext4_has_metadata_csum(inode->i_sb))
 413                 csum_size = sizeof(struct ext4_dir_entry_tail);
 414
 415         if (!de) {
 416 +               if (data)
 417 +                       dlen = (*data) + 1;
 418                 err = ext4_find_dest_de(dir, inode,
 419                                         bh, bh->b_data, blocksize - csum_size,
 420 -                                       name, namelen, &de);
 421 +                                       name, namelen, &de, &dlen);
 422                 if (err)
 423                         return err;
 424         }
 425 @@ -1753,7 +1792,10 @@ static int add_dirent_to_buf(handle_t *h
 426         }
 427
 428         /* By now the buffer is marked for journaling */
 429 -       ext4_insert_dentry(inode, de, blocksize, name, namelen);
 430 +       /* If writing the short form of "dotdot", don't add the data section */
 431 +       if (dlen == 1)
 432 +               data = NULL;
 433 +       ext4_insert_dentry(inode, de, blocksize, name, namelen, data);
 434
 435         /*
 436          * XXX shouldn't update any times until successful
 437 @@ -1864,7 +1906,8 @@ static int make_indexed_dir(handle_t *ha
 438
 439         dx_set_block(entries, 1);
 440         dx_set_count(entries, 1);
 441 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 442 +       dx_set_limit(entries, dx_root_limit(dir,
 443 +                                        dot_de, sizeof(*dx_info)));
 444
 445         /* Initialize as for dx_probe */
 446         hinfo.hash_version = dx_info->hash_version;
 447 @@ -1907,6 +1950,8 @@ static int ext4_update_dotdot(handle_t *
 448         struct buffer_head *dir_block;
 449         struct ext4_dir_entry_2 *de;
 450         int len, journal = 0, err = 0;
 451 +       int dlen = 0;
 452 +       char *data;
 453
 454         if (IS_ERR(handle))
 455                 return PTR_ERR(handle);
 456 @@ -1922,19 +1967,24 @@ static int ext4_update_dotdot(handle_t *
 457         /* the first item must be "." */
 458         assert(de->name_len == 1 && de->name[0] == '.');
 459         len = le16_to_cpu(de->rec_len);
 460 -       assert(len >= EXT4_DIR_REC_LEN(1));
 461 -       if (len > EXT4_DIR_REC_LEN(1)) {
 462 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 463 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 464                 BUFFER_TRACE(dir_block, "get_write_access");
 465                 err = ext4_journal_get_write_access(handle, dir_block);
 466                 if (err)
 467                         goto out_journal;
 468
 469                 journal = 1;
 470 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 471 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 472         }
 473
 474 -       len -= EXT4_DIR_REC_LEN(1);
 475 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 476 +       len -= EXT4_DIR_REC_LEN(de);
 477 +       data = ext4_dentry_get_data(dir->i_sb,
 478 +                       (struct ext4_dentry_param *)dentry->d_fsdata);
 479 +       if (data)
 480 +               dlen = *data + 1;
 481 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 482 +
 483         de = (struct ext4_dir_entry_2 *)
 484                         ((char *) de + le16_to_cpu(de->rec_len));
 485         if (!journal) {
 486 @@ -1948,10 +1998,15 @@ static int ext4_update_dotdot(handle_t *
 487         if (len > 0)
 488                 de->rec_len = cpu_to_le16(len);
 489         else
 490 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 491 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 492         de->name_len = 2;
 493         strcpy(de->name, "..");
 494 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 495 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 496 +               de->name[2] = 0;
 497 +               memcpy(&de->name[2 + 1], data, *data);
 498 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 499 +               de->file_type |= EXT4_DIRENT_LUFID;
 500 +       }
 501
 502  out_journal:
 503         if (journal) {
 504 @@ -2463,37 +2518,70 @@ err_unlock_inode:
 505         return err;
 506  }
 507
 508 +struct tp_block {
 509 +       struct inode *inode;
 510 +       void *data1;
 511 +       void *data2;
 512 +};
 513 +
 514  struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
 515                           struct ext4_dir_entry_2 *de,
 516                           int blocksize, int csum_size,
 517                           unsigned int parent_ino, int dotdot_real_len)
 518  {
 519 +       void *data1 = NULL, *data2 = NULL;
 520 +       int dot_reclen = 0;
 521 +
 522 +       if (dotdot_real_len == 10) {
 523 +               struct tp_block *tpb = (struct tp_block *)inode;
 524 +               data1 = tpb->data1;
 525 +               data2 = tpb->data2;
 526 +               inode = tpb->inode;
 527 +               dotdot_real_len = 0;
 528 +       }
 529         de->inode = cpu_to_le32(inode->i_ino);
 530         de->name_len = 1;
 531 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 532 -                                          blocksize);
 533         strcpy(de->name, ".");
 534         ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 535
 536 +       /* get packed fid data*/
 537 +       data1 = ext4_dentry_get_data(inode->i_sb,
 538 +                               (struct ext4_dentry_param *) data1);
 539 +       if (data1) {
 540 +               de->name[1] = 0;
 541 +               memcpy(&de->name[2], data1, *(char *) data1);
 542 +               de->file_type |= EXT4_DIRENT_LUFID;
 543 +       }
 544 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 545 +       dot_reclen = cpu_to_le16(de->rec_len);
 546         de = ext4_next_entry(de, blocksize);
 547         de->inode = cpu_to_le32(parent_ino);
 548         de->name_len = 2;
 549 +       strcpy(de->name, "..");
 550 +       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 551 +       data2 = ext4_dentry_get_data(inode->i_sb,
 552 +                       (struct ext4_dentry_param *) data2);
 553 +       if (data2) {
 554 +               de->name[2] = 0;
 555 +               memcpy(&de->name[3], data2, *(char *) data2);
 556 +               de->file_type |= EXT4_DIRENT_LUFID;
 557 +       }
 558         if (!dotdot_real_len)
 559                 de->rec_len = ext4_rec_len_to_disk(blocksize -
 560 -                                       (csum_size + EXT4_DIR_REC_LEN(1)),
 561 +                                       (csum_size + dot_reclen),
 562                                         blocksize);
 563         else
 564                 de->rec_len = ext4_rec_len_to_disk(
 565 -                               EXT4_DIR_REC_LEN(de->name_len), blocksize);
 566 -       strcpy(de->name, "..");
 567 -       ext4_set_de_type(inode->i_sb, de, S_IFDIR);
 568 +                               EXT4_DIR_REC_LEN(de), blocksize);
 569
 570         return ext4_next_entry(de, blocksize);
 571  }
 572
 573  static int ext4_init_new_dir(handle_t *handle, struct inode *dir,
 574 -                            struct inode *inode)
 575 +                            struct inode *inode,
 576 +                            const void *data1, const void *data2)
 577  {
 578 +       struct tp_block param;
 579         struct buffer_head *dir_block = NULL;
 580         struct ext4_dir_entry_2 *de;
 581         struct ext4_dir_entry_tail *t;
 582 @@ -2522,7 +2610,11 @@ static int ext4_init_new_dir(handle_t *h
 583         if (err)
 584                 goto out;
 585         de = (struct ext4_dir_entry_2 *)dir_block->b_data;
 586 -       ext4_init_dot_dotdot(inode, de, blocksize, csum_size, dir->i_ino, 0);
 587 +       param.inode = inode;
 588 +       param.data1 = (void *)data1;
 589 +       param.data2 = (void *)data2;
 590 +       ext4_init_dot_dotdot((struct inode *)(&param), de, blocksize,
 591 +                            csum_size, dir->i_ino, 10);
 592         set_nlink(inode, 2);
 593         if (csum_size) {
 594                 t = EXT4_DIRENT_TAIL(dir_block->b_data, blocksize);
 595 @@ -2539,6 +2631,29 @@ out:
 596         return err;
 597  }
 598
 599 +/* Initialize @inode as a subdirectory of @dir, and add the
 600 + * "." and ".." entries into the first directory block. */
 601 +int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 602 +                       struct inode *inode,
 603 +                       const void *data1, const void *data2)
 604 +{
 605 +       int rc;
 606 +
 607 +       if (IS_ERR(handle))
 608 +               return PTR_ERR(handle);
 609 +
 610 +       if (IS_DIRSYNC(dir))
 611 +               ext4_handle_sync(handle);
 612 +
 613 +       inode->i_op = &ext4_dir_inode_operations;
 614 +       inode->i_fop = &ext4_dir_operations;
 615 +       rc = ext4_init_new_dir(handle, dir, inode, data1, data2);
 616 +       if (!rc)
 617 +               rc = ext4_mark_inode_dirty(handle, inode);
 618 +       return rc;
 619 +}
 620 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 621 +
 622  static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 623  {
 624         handle_t *handle;
 625 @@ -2563,7 +2678,7 @@ retry:
 626
 627         inode->i_op = &ext4_dir_inode_operations;
 628         inode->i_fop = &ext4_dir_operations;
 629 -       err = ext4_init_new_dir(handle, dir, inode);
 630 +       err = ext4_init_new_dir(handle, dir, inode, NULL, NULL);
 631         if (err)
 632                 goto out_clear_inode;
 633         err = ext4_mark_inode_dirty(handle, inode);
 634 @@ -2615,7 +2730,7 @@ static int empty_dir(struct inode *inode
 635         }
 636
 637         sb = inode->i_sb;
 638 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)) {
 639 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2)) {
 640                 EXT4_ERROR_INODE(inode, "invalid size");
 641                 return 1;
 642         }
 643 Index: linux-stage/fs/ext4/inline.c
 644 ===================================================================
 645 --- linux-stage.orig/fs/ext4/inline.c
 646 +++ linux-stage/fs/ext4/inline.c
 647 @@ -998,17 +998,17 @@ static int ext4_add_dirent_to_inline(han
 648         int             err;
 649         struct ext4_dir_entry_2 *de;
 650
 651 -       reclen = EXT4_DIR_REC_LEN(namelen);
 652 +       reclen = __EXT4_DIR_REC_LEN(namelen);
 653         err = ext4_find_dest_de(dir, inode, iloc->bh,
 654                                 inline_start, inline_size,
 655 -                               name, namelen, &de);
 656 +                               name, namelen, &de, NULL);
 657         if (err)
 658                 return err;
 659
 660         err = ext4_journal_get_write_access(handle, iloc->bh);
 661         if (err)
 662                 return err;
 663 -       ext4_insert_dentry(inode, de, inline_size, name, namelen);
 664 +       ext4_insert_dentry(inode, de, inline_size, name, namelen, NULL);
 665
 666         ext4_show_inline_dir(dir, iloc->bh, inline_start, inline_size);
 667
 668 @@ -1078,7 +1078,7 @@ static int ext4_update_inline_dir(handle
 669         int old_size = EXT4_I(dir)->i_inline_size - EXT4_MIN_INLINE_DATA_SIZE;
 670         int new_size = get_max_inline_xattr_value_size(dir, iloc);
 671
 672 -       if (new_size - old_size <= EXT4_DIR_REC_LEN(1))
 673 +       if (new_size - old_size <= __EXT4_DIR_REC_LEN(1))
 674                 return -ENOSPC;
 675
 676         ret = ext4_update_inline_data(handle, dir,
 677 @@ -1347,7 +1347,7 @@ int htree_inlinedir_to_tree(struct file
 678                         fake.name_len = 1;
 679                         strcpy(fake.name, ".");
 680                         fake.rec_len = ext4_rec_len_to_disk(
 681 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 682 +                                               EXT4_DIR_REC_LEN(&fake),
 683                                                 inline_size);
 684                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 685                         de = &fake;
 686 @@ -1357,7 +1357,7 @@ int htree_inlinedir_to_tree(struct file
 687                         fake.name_len = 2;
 688                         strcpy(fake.name, "..");
 689                         fake.rec_len = ext4_rec_len_to_disk(
 690 -                                               EXT4_DIR_REC_LEN(fake.name_len),
 691 +                                               EXT4_DIR_REC_LEN(&fake),
 692                                                 inline_size);
 693                         ext4_set_de_type(inode->i_sb, &fake, S_IFDIR);
 694                         de = &fake;
 695 @@ -1452,8 +1452,8 @@ int ext4_read_inline_dir(struct file *fi
 696          * So we will use extra_offset and extra_size to indicate them
 697          * during the inline dir iteration.
 698          */
 699 -       dotdot_offset = EXT4_DIR_REC_LEN(1);
 700 -       dotdot_size = dotdot_offset + EXT4_DIR_REC_LEN(2);
 701 +       dotdot_offset = __EXT4_DIR_REC_LEN(1);
 702 +       dotdot_size = dotdot_offset + __EXT4_DIR_REC_LEN(2);
 703         extra_offset = dotdot_size - EXT4_INLINE_DOTDOT_SIZE;
 704         extra_size = extra_offset + inline_size;
 705
 706 @@ -1488,7 +1488,7 @@ int ext4_read_inline_dir(struct file *fi
 707                          * failure will be detected in the
 708                          * dirent test below. */
 709                         if (ext4_rec_len_from_disk(de->rec_len, extra_size)
 710 -                               < EXT4_DIR_REC_LEN(1))
 711 +                               < __EXT4_DIR_REC_LEN(1))
 712                                 break;
 713                         i += ext4_rec_len_from_disk(de->rec_len,
 714                                                     extra_size);
 715 Index: linux-stage/fs/ext4/super.c
 716 ===================================================================
 717 --- linux-stage.orig/fs/ext4/super.c
 718 +++ linux-stage/fs/ext4/super.c
 719 @@ -1133,7 +1133,7 @@ enum {
 720         Opt_data_err_abort, Opt_data_err_ignore,
 721         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 722         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 723 -       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 724 +       Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, Opt_dirdata,
 725         Opt_usrquota, Opt_grpquota, Opt_i_version,
 726         Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
 727         Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
 728 @@ -1199,6 +1199,7 @@ static const match_table_t tokens = {
 729         {Opt_stripe, "stripe=%u"},
 730         {Opt_delalloc, "delalloc"},
 731         {Opt_nodelalloc, "nodelalloc"},
 732 +       {Opt_dirdata, "dirdata"},
 733         {Opt_removed, "mblk_io_submit"},
 734         {Opt_removed, "nomblk_io_submit"},
 735         {Opt_block_validity, "block_validity"},
 736 @@ -1409,6 +1410,7 @@ static const struct mount_opts {
 737         {Opt_usrjquota, 0, MOPT_Q},
 738         {Opt_grpjquota, 0, MOPT_Q},
 739         {Opt_offusrjquota, 0, MOPT_Q},
 740 +       {Opt_dirdata, EXT4_MOUNT_DIRDATA, MOPT_SET},
 741         {Opt_offgrpjquota, 0, MOPT_Q},
 742         {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT},
 743         {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},