ldiskfs/kernel_patches/patches/rhel6.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-2.6.32-504.3.3.el6.x86_64/fs/ext4/dir.c
  11 ===================================================================
  12 --- linux-2.6.32-504.3.3.el6.x86_64.orig/fs/ext4/dir.c
  13 +++ linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/dir.c
  14 @@ -37,11 +37,18 @@ static int ext4_dx_readdir(struct file *
  15
  16  static unsigned char get_dtype(struct super_block *sb, int filetype)
  17  {
  18 +       int fl_index = filetype & EXT4_FT_MASK;
  19 +
  20         if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) ||
  21 -           (filetype >= EXT4_FT_MAX))
  22 +           (fl_index >= EXT4_FT_MAX))
  23                 return DT_UNKNOWN;
  24
  25 -       return (ext4_filetype_table[filetype]);
  26 +       if (!test_opt(sb, DIRDATA))
  27 +               return (ext4_filetype_table[fl_index]);
  28 +
  29 +       return (ext4_filetype_table[fl_index]) |
  30 +               (filetype & EXT4_DIRENT_LUFID);
  31 +
  32  }
  33
  34  /**
  35 @@ -73,11 +80,11 @@ int ext4_check_dir_entry(const char *fun
  36         const int rlen = ext4_rec_len_from_disk(de->rec_len,
  37                                                 dir->i_sb->s_blocksize);
  38
  39 -       if (unlikely(rlen < EXT4_DIR_REC_LEN(1)))
  40 +       if (unlikely(rlen < __EXT4_DIR_REC_LEN(1)))
  41                 error_msg = "rec_len is smaller than minimal";
  42         else if (unlikely(rlen % 4 != 0))
  43                 error_msg = "rec_len % 4 != 0";
  44 -       else if (unlikely(rlen < EXT4_DIR_REC_LEN(de->name_len)))
  45 +       else if (unlikely(rlen < EXT4_DIR_REC_LEN(de)))
  46                 error_msg = "rec_len is too small for name_len";
  47         else if (unlikely(((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize))
  48                 error_msg = "directory entry across blocks";
  49 @@ -181,7 +188,7 @@ revalidate:
  50                                  * failure will be detected in the
  51                                  * dirent test below. */
  52                                 if (ext4_rec_len_from_disk(de->rec_len,
  53 -                                       sb->s_blocksize) < EXT4_DIR_REC_LEN(1))
  54 +                                       sb->s_blocksize) < __EXT4_DIR_REC_LEN(1))
  55                                         break;
  56                                 i += ext4_rec_len_from_disk(de->rec_len,
  57                                                             sb->s_blocksize);
  58 @@ -410,12 +417,17 @@ int ext4_htree_store_dirent(struct file
  59         struct fname *fname, *new_fn;
  60         struct dir_private_info *info;
  61         int len;
  62 +       int extra_data = 0;
  63
  64         info = (struct dir_private_info *) dir_file->private_data;
  65         p = &info->root.rb_node;
  66
  67         /* Create and allocate the fname structure */
  68 -       len = sizeof(struct fname) + dirent->name_len + 1;
  69 +       if (dirent->file_type & EXT4_DIRENT_LUFID)
  70 +               extra_data = ext4_get_dirent_data_len(dirent);
  71 +
  72 +       len = sizeof(struct fname) + dirent->name_len + extra_data + 1;
  73 +
  74         new_fn = kzalloc(len, GFP_KERNEL);
  75         if (!new_fn)
  76                 return -ENOMEM;
  77 @@ -424,7 +436,7 @@ int ext4_htree_store_dirent(struct file
  78         new_fn->inode = le32_to_cpu(dirent->inode);
  79         new_fn->name_len = dirent->name_len;
  80         new_fn->file_type = dirent->file_type;
  81 -       memcpy(new_fn->name, dirent->name, dirent->name_len);
  82 +       memcpy(new_fn->name, dirent->name, dirent->name_len + extra_data);
  83         new_fn->name[dirent->name_len] = 0;
  84
  85         while (*p) {
  86 Index: linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/ext4.h
  87 ===================================================================
  88 --- linux-2.6.32-504.3.3.el6.x86_64.orig/fs/ext4/ext4.h
  89 +++ linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/ext4.h
  90 @@ -881,6 +881,7 @@ struct ext4_inode_info {
  91  #define EXT4_MOUNT_ERRORS_PANIC                0x00040 /* Panic on errors */
  92  #define EXT4_MOUNT_MINIX_DF            0x00080 /* Mimics the Minix statfs */
  93  #define EXT4_MOUNT_NOLOAD              0x00100 /* Don't use existing journal*/
  94 +#define EXT4_MOUNT_DIRDATA             0x00200 /* Data in directory entries*/
  95  #define EXT4_MOUNT_DATA_FLAGS          0x00C00 /* Mode for data writes: */
  96  #define EXT4_MOUNT_JOURNAL_DATA                0x00400 /* Write data to journal */
  97  #define EXT4_MOUNT_ORDERED_DATA                0x00800 /* Flush data before commit */
  98 @@ -1337,6 +1338,7 @@ EXT4_INODE_BIT_FNS(state, state_flags)
  99  #define EXT4_FEATURE_INCOMPAT_64BIT            0x0080
 100  #define EXT4_FEATURE_INCOMPAT_MMP               0x0100
 101  #define EXT4_FEATURE_INCOMPAT_FLEX_BG          0x0200
 102 +#define EXT4_FEATURE_INCOMPAT_DIRDATA          0x1000
 103
 104  #define EXT4_FEATURE_COMPAT_SUPP       EXT2_FEATURE_COMPAT_EXT_ATTR
 105  #define EXT4_FEATURE_INCOMPAT_SUPP     (EXT4_FEATURE_INCOMPAT_FILETYPE| \
 106 @@ -1345,7 +1347,9 @@ EXT4_INODE_BIT_FNS(state, state_flags)
 107                                          EXT4_FEATURE_INCOMPAT_EXTENTS| \
 108                                          EXT4_FEATURE_INCOMPAT_64BIT| \
 109                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
 110 -                                        EXT4_FEATURE_INCOMPAT_MMP)
 111 +                                        EXT4_FEATURE_INCOMPAT_MMP| \
 112 +                                        EXT4_FEATURE_INCOMPAT_DIRDATA)
 113 +
 114  #define EXT4_FEATURE_RO_COMPAT_SUPP    (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
 115                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
 116                                          EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
 117 @@ -1431,6 +1435,43 @@ struct ext4_dir_entry_2 {
 118  #define EXT4_FT_SYMLINK                7
 119
 120  #define EXT4_FT_MAX            8
 121 +#define EXT4_FT_MASK           0xf
 122 +
 123 +#if EXT4_FT_MAX > EXT4_FT_MASK
 124 +#error "conflicting EXT4_FT_MAX and EXT4_FT_MASK"
 125 +#endif
 126 +
 127 +/*
 128 + * d_type has 4 unused bits, so it can hold four types data. these different
 129 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
 130 + * stored, in flag order, after file-name in ext4 dirent.
 131 +*/
 132 +/*
 133 + * this flag is added to d_type if ext4 dirent has extra data after
 134 + * filename. this data length is variable and length is stored in first byte
 135 + * of data. data start after filename NUL byte.
 136 + * This is used by Lustre FS.
 137 +  */
 138 +#define EXT4_DIRENT_LUFID              0x10
 139 +
 140 +#define EXT4_LUFID_MAGIC    0xAD200907UL
 141 +struct ext4_dentry_param {
 142 +       __u32  edp_magic;       /* EXT4_LUFID_MAGIC */
 143 +       char   edp_len;         /* size of edp_data in bytes */
 144 +       char   edp_data[0];     /* packed array of data */
 145 +} __attribute__((packed));
 146 +
 147 +static inline unsigned char *ext4_dentry_get_data(struct super_block *sb,
 148 +               struct ext4_dentry_param* p)
 149 +
 150 +{
 151 +       if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_DIRDATA))
 152 +               return NULL;
 153 +       if (p && p->edp_magic == EXT4_LUFID_MAGIC)
 154 +               return &p->edp_len;
 155 +       else
 156 +               return NULL;
 157 +}
 158
 159  /*
 160   * EXT4_DIR_PAD defines the directory entries boundaries
 161 @@ -1439,8 +1480,11 @@ struct ext4_dir_entry_2 {
 162   */
 163  #define EXT4_DIR_PAD                   4
 164  #define EXT4_DIR_ROUND                 (EXT4_DIR_PAD - 1)
 165 -#define EXT4_DIR_REC_LEN(name_len)     (((name_len) + 8 + EXT4_DIR_ROUND) & \
 166 +#define __EXT4_DIR_REC_LEN(name_len)   (((name_len) + 8 + EXT4_DIR_ROUND) & \
 167                                          ~EXT4_DIR_ROUND)
 168 +#define EXT4_DIR_REC_LEN(de)           (__EXT4_DIR_REC_LEN(de->name_len +\
 169 +                                       ext4_get_dirent_data_len(de)))
 170 +
 171  #define EXT4_MAX_REC_LEN               ((1<<16)-1)
 172
 173  static inline unsigned int
 174 @@ -1841,7 +1885,7 @@ extern struct buffer_head * ext4_find_en
 175                                             struct ext4_dir_entry_2 ** res_dir);
 176  #define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(inode, &(dentry)->d_name, res_dir)
 177  extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
 178 -                              struct inode *inode);
 179 +                              struct inode *inode, const void *, const void *);
 180  extern struct buffer_head *ext4_append(handle_t *handle,
 181                                        struct inode *inode,
 182                                        ext4_lblk_t *block, int *err);
 183 @@ -2198,6 +2242,28 @@ extern wait_queue_head_t aio_wq[];
 184  #define to_aio_wq(v) (&aio_wq[((unsigned long)v) % WQ_HASH_SZ])
 185  extern void ext4_aio_wait(struct inode *inode);
 186
 187 +/*
 188 + * Compute the total directory entry data length.
 189 + * This includes the filename and an implicit NUL terminator (always present),
 190 + * and optional extensions.  Each extension has a bit set in the high 4 bits of
 191 + * de->file_type, and the extension length is the first byte in each entry.
 192 + */
 193 +static inline int ext4_get_dirent_data_len(struct ext4_dir_entry_2 *de)
 194 +{
 195 +       char *len = de->name + de->name_len + 1 /* NUL terminator */;
 196 +       int dlen = 0;
 197 +       __u8 extra_data_flags = (de->file_type & ~EXT4_FT_MASK) >> 4;
 198 +
 199 +       while (extra_data_flags) {
 200 +               if (extra_data_flags & 1) {
 201 +                       dlen += *len + (dlen == 0);
 202 +                       len += *len;
 203 +               }
 204 +               extra_data_flags >>= 1;
 205 +       }
 206 +       return dlen;
 207 +}
 208 +
 209  #endif /* __KERNEL__ */
 210
 211  #endif /* _EXT4_H */
 212 Index: linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/namei.c
 213 ===================================================================
 214 --- linux-2.6.32-504.3.3.el6.x86_64.orig/fs/ext4/namei.c
 215 +++ linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/namei.c
 216 @@ -169,7 +169,8 @@ static unsigned dx_get_count(struct dx_e
 217  static unsigned dx_get_limit(struct dx_entry *entries);
 218  static void dx_set_count(struct dx_entry *entries, unsigned value);
 219  static void dx_set_limit(struct dx_entry *entries, unsigned value);
 220 -static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
 221 +static inline unsigned dx_root_limit(__u32 blocksize,
 222 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize);
 223  static unsigned dx_node_limit(struct inode *dir);
 224  static struct dx_frame *dx_probe(const struct qstr *d_name,
 225                                  struct inode *dir,
 226 @@ -212,11 +213,12 @@ ext4_next_entry(struct ext4_dir_entry_2
 227   */
 228  struct dx_root_info * dx_get_dx_info(struct ext4_dir_entry_2 *de)
 229  {
 230 -       /* get dotdot first */
 231 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(1));
 232 +       BUG_ON(de->name_len != 1);
 233 +       /* get dotdot first */
 234 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 235
 236 -       /* dx root info is after dotdot entry */
 237 -       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(2));
 238 +       /* dx root info is after dotdot entry */
 239 +       de = (struct ext4_dir_entry_2 *)((char *)de + EXT4_DIR_REC_LEN(de));
 240
 241         return (struct dx_root_info *) de;
 242  }
 243 @@ -261,16 +263,23 @@ static inline void dx_set_limit(struct d
 244         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
 245  }
 246
 247 -static inline unsigned dx_root_limit(struct inode *dir, unsigned infosize)
 248 +static inline unsigned dx_root_limit(__u32 blocksize,
 249 +               struct ext4_dir_entry_2 *dot_de, unsigned infosize)
 250  {
 251 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(1) -
 252 -               EXT4_DIR_REC_LEN(2) - infosize;
 253 +       struct ext4_dir_entry_2 *dotdot_de;
 254 +       unsigned entry_space;
 255 +
 256 +       BUG_ON(dot_de->name_len != 1);
 257 +       dotdot_de = ext4_next_entry(dot_de, blocksize);
 258 +       entry_space = blocksize - EXT4_DIR_REC_LEN(dot_de) -
 259 +                        EXT4_DIR_REC_LEN(dotdot_de) - infosize;
 260 +
 261         return entry_space / sizeof(struct dx_entry);
 262  }
 263
 264  static inline unsigned dx_node_limit(struct inode *dir)
 265  {
 266 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT4_DIR_REC_LEN(0);
 267 +       unsigned entry_space = dir->i_sb->s_blocksize - __EXT4_DIR_REC_LEN(0);
 268         return entry_space / sizeof(struct dx_entry);
 269  }
 270
 271 @@ -317,7 +326,7 @@ static struct stats dx_show_leaf(struct
 272                                 printk(":%x.%u ", h.hash,
 273                                        ((char *) de - base));
 274                         }
 275 -                       space += EXT4_DIR_REC_LEN(de->name_len);
 276 +                       space += EXT4_DIR_REC_LEN(de);
 277                         names++;
 278                 }
 279                 de = ext4_next_entry(de, size);
 280 @@ -419,7 +428,8 @@ dx_probe(const struct qstr *d_name, stru
 281
 282         entries = (struct dx_entry *) (((char *)info) + info->info_length);
 283
 284 -       if (dx_get_limit(entries) != dx_root_limit(dir,
 285 +       if (dx_get_limit(entries) != dx_root_limit(dir->i_sb->s_blocksize,
 286 +                                                  (struct ext4_dir_entry_2*)bh->b_data,
 287                                                    info->info_length)) {
 288                 ext4_warning(dir->i_sb, "dx entry: limit != root limit");
 289                 brelse(bh);
 290 @@ -608,7 +618,7 @@ static int htree_dirblock_to_tree(struct
 291         de = (struct ext4_dir_entry_2 *) bh->b_data;
 292         top = (struct ext4_dir_entry_2 *) ((char *) de +
 293                                            dir->i_sb->s_blocksize -
 294 -                                          EXT4_DIR_REC_LEN(0));
 295 +                                          __EXT4_DIR_REC_LEN(0));
 296         for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
 297                 if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
 298                                         (block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))
 299 @@ -1020,7 +1030,7 @@ static struct buffer_head * ext4_dx_find
 300                         goto errout;
 301                 de = (struct ext4_dir_entry_2 *) bh->b_data;
 302                 top = (struct ext4_dir_entry_2 *) ((char *) de + sb->s_blocksize -
 303 -                                      EXT4_DIR_REC_LEN(0));
 304 +                                      __EXT4_DIR_REC_LEN(0));
 305                 for (; de < top; de = ext4_next_entry(de, sb->s_blocksize)) {
 306                         int off = (block << EXT4_BLOCK_SIZE_BITS(sb))
 307                                   + ((char *) de - bh->b_data);
 308 @@ -1181,7 +1191,7 @@ dx_move_dirents(char *from, char *to, st
 309         while (count--) {
 310                 struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
 311                                                 (from + (map->offs<<2));
 312 -               rec_len = EXT4_DIR_REC_LEN(de->name_len);
 313 +               rec_len = EXT4_DIR_REC_LEN(de);
 314                 memcpy (to, de, rec_len);
 315                 ((struct ext4_dir_entry_2 *) to)->rec_len =
 316                                 ext4_rec_len_to_disk(rec_len, blocksize);
 317 @@ -1205,7 +1215,7 @@ static struct ext4_dir_entry_2* dx_pack_
 318         while ((char*)de < base + blocksize) {
 319                 next = ext4_next_entry(de, blocksize);
 320                 if (de->inode && de->name_len) {
 321 -                       rec_len = EXT4_DIR_REC_LEN(de->name_len);
 322 +                       rec_len = EXT4_DIR_REC_LEN(de);
 323                         if (de > to)
 324                                 memmove(to, de, rec_len);
 325                         to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
 326 @@ -1334,11 +1344,28 @@ static int add_dirent_to_buf(handle_t *h
 327         int             namelen = dentry->d_name.len;
 328         unsigned int    offset = 0;
 329         unsigned int    blocksize = dir->i_sb->s_blocksize;
 330 -       unsigned short  reclen;
 331 -       int             nlen, rlen, err;
 332 +       unsigned short  reclen, dotdot_reclen = 0;
 333 +       int             nlen, rlen, err, dlen = 0;
 334 +       bool            is_dotdot = false, write_short_dotdot = false;
 335 +       unsigned char   *data;
 336         char            *top;
 337
 338 -       reclen = EXT4_DIR_REC_LEN(namelen);
 339 +       data = ext4_dentry_get_data(inode->i_sb, (struct ext4_dentry_param *)
 340 +                                               dentry->d_fsdata);
 341 +       if (data)
 342 +               dlen = (*data) + 1;
 343 +
 344 +       is_dotdot = (namelen == 2 &&
 345 +                    memcmp(dentry->d_name.name, "..", 2) == 0);
 346 +
 347 +       /* dotdot entries must be in the second place in a directory block,
 348 +        * so calculate an alternate length without the FID so they can
 349 +        * always be made to fit in the existing slot - LU-5626 */
 350 +       if (is_dotdot)
 351 +               dotdot_reclen = __EXT4_DIR_REC_LEN(namelen);
 352 +
 353 +       reclen = __EXT4_DIR_REC_LEN(namelen + dlen);
 354 +
 355         if (!de) {
 356                 de = (struct ext4_dir_entry_2 *)bh->b_data;
 357                 top = bh->b_data + blocksize - reclen;
 358 @@ -1348,10 +1375,25 @@ static int add_dirent_to_buf(handle_t *h
 359                                 return -EIO;
 360                         if (ext4_match(namelen, name, de))
 361                                 return -EEXIST;
 362 -                       nlen = EXT4_DIR_REC_LEN(de->name_len);
 363 +                       nlen = EXT4_DIR_REC_LEN(de);
 364                         rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
 365 -                       if ((de->inode? rlen - nlen: rlen) >= reclen)
 366 +                       /* Check first for enough space for the full entry */
 367 +                       if ((de->inode ? rlen - nlen : rlen) >= reclen)
 368                                 break;
 369 +                       /* Then for dotdot entries, check for the smaller space
 370 +                        * required for just the entry, no FID */
 371 +                       if (is_dotdot) {
 372 +                               if ((de->inode ? rlen - nlen : rlen) >=
 373 +                                   dotdot_reclen) {
 374 +                                       write_short_dotdot = true;
 375 +                                       break;
 376 +                               }
 377 +                               /* The new ".." entry mut be written over the
 378 +                                * previous ".." entry, which is the first
 379 +                                * entry traversed by this scan.  If it doesn't
 380 +                                * fit, something is badly wrong, so -EIO. */
 381 +                               return -EIO;
 382 +                       }
 383                         de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
 384                         offset += rlen;
 385                 }
 386 @@ -1366,7 +1408,7 @@ static int add_dirent_to_buf(handle_t *h
 387         }
 388
 389         /* By now the buffer is marked for journaling */
 390 -       nlen = EXT4_DIR_REC_LEN(de->name_len);
 391 +       nlen = EXT4_DIR_REC_LEN(de);
 392         rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
 393         if (de->inode) {
 394                 struct ext4_dir_entry_2 *de1 = (struct ext4_dir_entry_2 *)((char *)de + nlen);
 395 @@ -1382,6 +1424,13 @@ static int add_dirent_to_buf(handle_t *h
 396                 de->inode = 0;
 397         de->name_len = namelen;
 398         memcpy(de->name, name, namelen);
 399 +       /* If we're writing the short form of "dotdot", don't add the data section */
 400 +       if (data && !write_short_dotdot) {
 401 +               de->name[namelen] = 0;
 402 +               memcpy(&de->name[namelen + 1], data, *(char *) data);
 403 +               de->file_type |= EXT4_DIRENT_LUFID;
 404 +       }
 405 +
 406         /*
 407          * XXX shouldn't update any times until successful
 408          * completion of syscall, but too many callers depend
 409 @@ -1480,7 +1529,8 @@ static int make_indexed_dir(handle_t *ha
 410
 411         dx_set_block(entries, 1);
 412         dx_set_count(entries, 1);
 413 -       dx_set_limit(entries, dx_root_limit(dir, sizeof(*dx_info)));
 414 +       dx_set_limit(entries, dx_root_limit(dir->i_sb->s_blocksize,
 415 +                                        dot_de, sizeof(*dx_info)));
 416
 417         /* Initialize as for dx_probe */
 418         hinfo.hash_version = dx_info->hash_version;
 419 @@ -1523,6 +1573,8 @@ static int ext4_update_dotdot(handle_t *
 420         struct buffer_head * dir_block;
 421         struct ext4_dir_entry_2 * de;
 422         int len, journal = 0, err = 0;
 423 +       int dlen = 0;
 424 +       char *data;
 425
 426         if (IS_ERR(handle))
 427                 return PTR_ERR(handle);
 428 @@ -1538,19 +1590,24 @@ static int ext4_update_dotdot(handle_t *
 429         /* the first item must be "." */
 430         assert(de->name_len == 1 && de->name[0] == '.');
 431         len = le16_to_cpu(de->rec_len);
 432 -       assert(len >= EXT4_DIR_REC_LEN(1));
 433 -       if (len > EXT4_DIR_REC_LEN(1)) {
 434 +       assert(len >= __EXT4_DIR_REC_LEN(1));
 435 +       if (len > __EXT4_DIR_REC_LEN(1)) {
 436                 BUFFER_TRACE(dir_block, "get_write_access");
 437                 err = ext4_journal_get_write_access(handle, dir_block);
 438                 if (err)
 439                         goto out_journal;
 440
 441                 journal = 1;
 442 -               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(1));
 443 +               de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 444         }
 445
 446 -       len -= EXT4_DIR_REC_LEN(1);
 447 -       assert(len == 0 || len >= EXT4_DIR_REC_LEN(2));
 448 +       len -= EXT4_DIR_REC_LEN(de);
 449 +       data = ext4_dentry_get_data(dir->i_sb,
 450 +                       (struct ext4_dentry_param *) dentry->d_fsdata);
 451 +       if (data)
 452 +               dlen = *data + 1;
 453 +       assert(len == 0 || len >= __EXT4_DIR_REC_LEN(2 + dlen));
 454 +
 455         de = (struct ext4_dir_entry_2 *)
 456                         ((char *) de + le16_to_cpu(de->rec_len));
 457         if (!journal) {
 458 @@ -1564,10 +1621,15 @@ static int ext4_update_dotdot(handle_t *
 459         if (len > 0)
 460                 de->rec_len = cpu_to_le16(len);
 461         else
 462 -               assert(le16_to_cpu(de->rec_len) >= EXT4_DIR_REC_LEN(2));
 463 +               assert(le16_to_cpu(de->rec_len) >= __EXT4_DIR_REC_LEN(2));
 464         de->name_len = 2;
 465         strcpy (de->name, "..");
 466 -       ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 467 +       if (data != NULL && ext4_get_dirent_data_len(de) >= dlen) {
 468 +               de->name[2] = 0;
 469 +               memcpy(&de->name[2 + 1], data, *data);
 470 +               ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 471 +               de->file_type |= EXT4_DIRENT_LUFID;
 472 +       }
 473
 474  out_journal:
 475         if (journal) {
 476 @@ -1993,12 +2055,13 @@ retry:
 477  /* Initialize @inode as a subdirectory of @dir, and add the
 478   * "." and ".." entries into the first directory block. */
 479  int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir,
 480 -                       struct inode *inode)
 481 +                       struct inode *inode,
 482 +                        const void *data1, const void *data2)
 483  {
 484         struct buffer_head * dir_block;
 485         struct ext4_dir_entry_2 * de;
 486         unsigned int blocksize = dir->i_sb->s_blocksize;
 487 -       int err = 0;
 488 +       int err = 0, dot_reclen;
 489
 490         if (IS_ERR(handle))
 491                 return PTR_ERR(handle);
 492 @@ -2019,17 +2082,32 @@ int ext4_add_dot_dotdot(handle_t *handle
 493         de = (struct ext4_dir_entry_2 *) dir_block->b_data;
 494         de->inode = cpu_to_le32(inode->i_ino);
 495         de->name_len = 1;
 496 -       de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len),
 497 -                                          blocksize);
 498         strcpy(de->name, ".");
 499         ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 500 +       /* get packed fid data*/
 501 +       data1 = ext4_dentry_get_data(dir->i_sb,
 502 +                               (struct ext4_dentry_param *) data1);
 503 +       if (data1) {
 504 +               de->name[1] = 0;
 505 +               memcpy(&de->name[2], data1, *(char *) data1);
 506 +               de->file_type |= EXT4_DIRENT_LUFID;
 507 +       }
 508 +       de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
 509 +       dot_reclen = cpu_to_le16(de->rec_len);
 510         de = ext4_next_entry(de, blocksize);
 511         de->inode = cpu_to_le32(dir->i_ino);
 512 -       de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(1),
 513 +       de->rec_len = ext4_rec_len_to_disk(blocksize - dot_reclen,
 514                                            blocksize);
 515         de->name_len = 2;
 516         strcpy(de->name, "..");
 517         ext4_set_de_type(dir->i_sb, de, S_IFDIR);
 518 +       data2 = ext4_dentry_get_data(dir->i_sb,
 519 +                       (struct ext4_dentry_param *) data2);
 520 +       if (data2) {
 521 +               de->name[2] = 0;
 522 +               memcpy(&de->name[3], data2, *(char *) data2);
 523 +               de->file_type |= EXT4_DIRENT_LUFID;
 524 +       }
 525         inode->i_nlink = 2;
 526         BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
 527         err = ext4_handle_dirty_metadata(handle, inode, dir_block);
 528 @@ -2068,7 +2146,7 @@ retry:
 529         if (IS_ERR(inode))
 530                 goto out_stop;
 531
 532 -       err = ext4_add_dot_dotdot(handle, dir, inode);
 533 +       err = ext4_add_dot_dotdot(handle, dir, inode, NULL, NULL);
 534         if (err)
 535                 goto out_clear_inode;
 536
 537 @@ -2107,7 +2185,7 @@ static int empty_dir(struct inode *inode
 538         int err = 0;
 539
 540         sb = inode->i_sb;
 541 -       if (inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2) ||
 542 +       if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2) ||
 543             !(bh = ext4_bread(NULL, inode, 0, 0, &err))) {
 544                 if (err)
 545                         ext4_error(inode->i_sb,
 546 Index: linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/super.c
 547 ===================================================================
 548 --- linux-2.6.32-504.3.3.el6.x86_64.orig/fs/ext4/super.c
 549 +++ linux-2.6.32-504.3.3.el6.x86_64/fs/ext4/super.c
 550 @@ -1203,6 +1203,7 @@ enum {
 551         Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 552         Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
 553         Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err,
 554 +       Opt_dirdata,
 555         Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version,
 556         Opt_stripe, Opt_delalloc, Opt_nodelalloc,
 557         Opt_block_validity, Opt_noblock_validity,
 558 @@ -1259,6 +1260,7 @@ static const match_table_t tokens = {
 559         {Opt_noquota, "noquota"},
 560         {Opt_quota, "quota"},
 561         {Opt_usrquota, "usrquota"},
 562 +       {Opt_dirdata, "dirdata"},
 563         {Opt_barrier, "barrier=%u"},
 564         {Opt_barrier, "barrier"},
 565         {Opt_nobarrier, "nobarrier"},
 566 @@ -1634,6 +1636,9 @@ set_qf_format:
 567                         else
 568                                 clear_opt(sbi->s_mount_opt, BARRIER);
 569                         break;
 570 +               case Opt_dirdata:
 571 +                       set_opt(sbi->s_mount_opt, DIRDATA);
 572 +                       break;
 573                 case Opt_ignore:
 574                         break;
 575                 case Opt_resize: