ldiskfs/kernel_patches/patches/ext3_data_in_dirent.patch

   1 this patch implements feature which allows ext3 fs users (e.g. Lustre)
   2 to store data in ext3 dirent.
   3 data is stored in ext3 dirent after file-name, this space is accounted
   4 in de->rec_len. flag EXT3_DIRENT_LUFID added to d_type if extra data
   5 is present.
   6
   7 make use of dentry->d_fsdata to pass fid to ext3. so no
   8 changes in ext3_add_entry() interface required.
   9
  10 Index: b/fs/ext3/namei.c
  11 ===================================================================
  12 --- a/fs/ext3/namei.c
  13 +++ b/fs/ext3/namei.c
  14 @@ -174,7 +174,8 @@ static unsigned dx_get_count (struct dx_
  15  static unsigned dx_get_limit (struct dx_entry *entries);
  16  static void dx_set_count (struct dx_entry *entries, unsigned value);
  17  static void dx_set_limit (struct dx_entry *entries, unsigned value);
  18 -static unsigned dx_root_limit (struct inode *dir, unsigned infosize);
  19 +static unsigned dx_root_limit (__u32 blocksize, struct ext3_dir_entry_2*,
  20 +                        unsigned infosize);
  21  static unsigned dx_node_limit (struct inode *dir);
  22  static struct dx_frame *dx_probe(struct dentry *dentry,
  23                                  struct inode *dir,
  24 @@ -204,11 +205,13 @@ static int ext3_dx_add_entry(handle_t *h
  25   */
  26  struct dx_root_info * dx_get_dx_info(struct ext3_dir_entry_2 *de)
  27  {
  28 +       BUG_ON(de->name_len != 1);
  29 +
  30         /* get dotdot first */
  31         de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
  32
  33         /* dx root info is after dotdot entry */
  34 -       de = (struct ext3_dir_entry_2 *)((char *)de + EXT3_DIR_REC_LEN(2));
  35 +       de = (struct ext3_dir_entry_2 *)((char *)de + EXT3_DIR_REC_LEN(de));
  36
  37         return (struct dx_root_info *) de;
  38  }
  39 @@ -253,16 +256,24 @@ static inline void dx_set_limit (struct
  40         ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
  41  }
  42
  43 -static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize)
  44 +static inline unsigned dx_root_limit (__u32 blocksize,
  45 +                       struct ext3_dir_entry_2 * dot_de, unsigned infosize)
  46  {
  47 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(1) -
  48 -               EXT3_DIR_REC_LEN(2) - infosize;
  49 -       return 0? 20: entry_space / sizeof(struct dx_entry);
  50 +       struct ext3_dir_entry_2 * dotdot_de;
  51 +       unsigned entry_space;
  52 +
  53 +       BUG_ON(dot_de->name_len != 1);
  54 +       dotdot_de = (struct ext3_dir_entry_2 *)((char *)dot_de
  55 +                        + le16_to_cpu(dot_de->rec_len));
  56 +       entry_space = blocksize - EXT3_DIR_REC_LEN(dot_de) -
  57 +                        EXT3_DIR_REC_LEN(dotdot_de) - infosize;
  58 +
  59 +       return entry_space / sizeof(struct dx_entry);
  60  }
  61
  62  static inline unsigned dx_node_limit (struct inode *dir)
  63  {
  64 -       unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(0);
  65 +       unsigned entry_space = dir->i_sb->s_blocksize - __EXT3_DIR_REC_LEN(1);
  66         return 0? 22: entry_space / sizeof(struct dx_entry);
  67  }
  68
  69 @@ -309,7 +320,7 @@ static struct stats dx_show_leaf(struct
  70                                 printk(":%x.%u ", h.hash,
  71                                        ((char *) de - base));
  72                         }
  73 -                       space += EXT3_DIR_REC_LEN(de->name_len);
  74 +                       space += EXT3_DIR_REC_LEN(de);
  75                         names++;
  76                 }
  77                 de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len));
  78 @@ -411,7 +422,10 @@ dx_probe(struct dentry *dentry, struct i
  79         }
  80
  81         entries = (struct dx_entry *) (((char *)info) + info->info_length);
  82 -       assert(dx_get_limit(entries) == dx_root_limit(dir, info->info_length));
  83 +       assert(dx_get_limit(entries) == dx_root_limit(dir->i_sb->s_blocksize,
  84 +                                               (struct ext3_dir_entry_2*)bh->b_data,
  85 +                                               info->info_length));
  86 +
  87
  88         dxtrace (printk("Look up %x", hash));
  89         while (1)
  90 @@ -583,7 +597,7 @@ static int htree_dirblock_to_tree(struct
  91         de = (struct ext3_dir_entry_2 *) bh->b_data;
  92         top = (struct ext3_dir_entry_2 *) ((char *) de +
  93                                            dir->i_sb->s_blocksize -
  94 -                                          EXT3_DIR_REC_LEN(0));
  95 +                                          __EXT3_DIR_REC_LEN(0));
  96         for (; de < top; de = ext3_next_entry(de)) {
  97                 if (!ext3_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
  98                                         (block<<EXT3_BLOCK_SIZE_BITS(dir->i_sb))
  99 @@ -1001,7 +1015,7 @@ static struct buffer_head * ext3_dx_find
 100                         goto errout;
 101                 de = (struct ext3_dir_entry_2 *) bh->b_data;
 102                 top = (struct ext3_dir_entry_2 *) ((char *) de + sb->s_blocksize -
 103 -                                      EXT3_DIR_REC_LEN(0));
 104 +                                       __EXT3_DIR_REC_LEN(0));
 105                 for (; de < top; de = ext3_next_entry(de))
 106                 if (ext3_match (namelen, name, de)) {
 107                         if (!ext3_check_dir_entry("ext3_find_entry",
 108 @@ -1183,7 +1197,7 @@ dx_move_dirents(char *from, char *to, st
 109
 110         while (count--) {
 111                 struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *) (from + map->offs);
 112 -               rec_len = EXT3_DIR_REC_LEN(de->name_len);
 113 +               rec_len = EXT3_DIR_REC_LEN(de);
 114                 memcpy (to, de, rec_len);
 115                 ((struct ext3_dir_entry_2 *) to)->rec_len =
 116                                 cpu_to_le16(rec_len);
 117 @@ -1208,7 +1222,7 @@ static struct ext3_dir_entry_2* dx_pack_
 118                 next = (struct ext3_dir_entry_2 *) ((char *) de +
 119                                                     le16_to_cpu(de->rec_len));
 120                 if (de->inode && de->name_len) {
 121 -                       rec_len = EXT3_DIR_REC_LEN(de->name_len);
 122 +                       rec_len = EXT3_DIR_REC_LEN(de);
 123                         if (de > to)
 124                                 memmove(to, de, rec_len);
 125                         to->rec_len = cpu_to_le16(rec_len);
 126 @@ -1334,12 +1348,18 @@ static int add_dirent_to_buf(handle_t *h
 127         struct inode    *dir = dentry->d_parent->d_inode;
 128         const char      *name = dentry->d_name.name;
 129         int             namelen = dentry->d_name.len;
 130 +       unsigned char  *data;
 131         unsigned long   offset = 0;
 132         unsigned short  reclen;
 133 -       int             nlen, rlen, err;
 134 +       int             nlen, rlen, err, dlen = 0;
 135         char            *top;
 136
 137 -       reclen = EXT3_DIR_REC_LEN(namelen);
 138 +       data = ext3_dentry_get_data(inode->i_sb, (struct ext3_dentry_param *)
 139 +                                               dentry->d_fsdata);
 140 +
 141 +       if (data)
 142 +               dlen = *data + 1;
 143 +       reclen = __EXT3_DIR_REC_LEN(namelen + dlen);
 144         if (!de) {
 145                 de = (struct ext3_dir_entry_2 *)bh->b_data;
 146                 top = bh->b_data + dir->i_sb->s_blocksize - reclen;
 147 @@ -1353,7 +1373,7 @@ static int add_dirent_to_buf(handle_t *h
 148                                 brelse (bh);
 149                                 return -EEXIST;
 150                         }
 151 -                       nlen = EXT3_DIR_REC_LEN(de->name_len);
 152 +                       nlen = EXT3_DIR_REC_LEN(de);
 153                         rlen = le16_to_cpu(de->rec_len);
 154                         if ((de->inode? rlen - nlen: rlen) >= reclen)
 155                                 break;
 156 @@ -1372,7 +1392,7 @@ static int add_dirent_to_buf(handle_t *h
 157         }
 158
 159         /* By now the buffer is marked for journaling */
 160 -       nlen = EXT3_DIR_REC_LEN(de->name_len);
 161 +       nlen = EXT3_DIR_REC_LEN(de);
 162         rlen = le16_to_cpu(de->rec_len);
 163         if (de->inode) {
 164                 struct ext3_dir_entry_2 *de1 = (struct ext3_dir_entry_2 *)((char *)de + nlen);
 165 @@ -1388,6 +1408,11 @@ static int add_dirent_to_buf(handle_t *h
 166                 de->inode = 0;
 167         de->name_len = namelen;
 168         memcpy (de->name, name, namelen);
 169 +       if (data) {
 170 +               de->name[namelen] = 0;
 171 +               memcpy(&de->name[namelen + 1], data, *(char*) data);
 172 +               de->file_type |= EXT3_DIRENT_LUFID;
 173 +       }
 174         /*
 175          * XXX shouldn't update any times until successful
 176          * completion of syscall, but too many callers depend
 177 @@ -1474,7 +1499,8 @@ static int make_indexed_dir(handle_t *ha
 178         entries = (void *)dx_info + sizeof(*dx_info);
 179         dx_set_block (entries, 1);
 180         dx_set_count (entries, 1);
 181 -       dx_set_limit (entries, dx_root_limit(dir, sizeof(*dx_info)));
 182 +       dx_set_limit (entries, dx_root_limit(dir->i_sb->s_blocksize,
 183 +                                        dot_de, sizeof(*dx_info)));
 184
 185         /* Initialize as for dx_probe */
 186         hinfo.hash_version = dx_info->hash_version;
 187 @@ -1502,6 +1528,8 @@ static int ext3_update_dotdot(handle_t *
 188         struct buffer_head * dir_block;
 189         struct ext3_dir_entry_2 * de;
 190         int len, journal = 0, err = 0;
 191 +       int dlen = 0;
 192 +       char *data;
 193
 194         if (IS_ERR(handle))
 195                 return PTR_ERR(handle);
 196 @@ -1517,19 +1545,23 @@ static int ext3_update_dotdot(handle_t *
 197         /* the first item must be "." */
 198         assert(de->name_len == 1 && de->name[0] == '.');
 199         len = le16_to_cpu(de->rec_len);
 200 -       assert(len >= EXT3_DIR_REC_LEN(1));
 201 -       if (len > EXT3_DIR_REC_LEN(1)) {
 202 +       assert(len >= __EXT3_DIR_REC_LEN(1));
 203 +       if (len > __EXT3_DIR_REC_LEN(1)) {
 204                 BUFFER_TRACE(dir_block, "get_write_access");
 205                 err = ext3_journal_get_write_access(handle, dir_block);
 206                 if (err)
 207                         goto out_journal;
 208
 209                 journal = 1;
 210 -               de->rec_len = cpu_to_le16(EXT3_DIR_REC_LEN(1));
 211 +               de->rec_len = cpu_to_le16(EXT3_DIR_REC_LEN(de));
 212         }
 213
 214 -       len -= EXT3_DIR_REC_LEN(1);
 215 -       assert(len == 0 || len >= EXT3_DIR_REC_LEN(2));
 216 +       len -= EXT3_DIR_REC_LEN(de);
 217 +       data = ext3_dentry_get_data(dir->i_sb,
 218 +                               (struct ext3_dentry_param *) dentry->d_fsdata);
 219 +       if (data)
 220 +               dlen = *data + 1;
 221 +       assert(len == 0 || len >= __EXT3_DIR_REC_LEN(2 + dlen));
 222         de = (struct ext3_dir_entry_2 *)
 223                         ((char *) de + le16_to_cpu(de->rec_len));
 224         if (!journal) {
 225 @@ -1543,11 +1575,15 @@ static int ext3_update_dotdot(handle_t *
 226         if (len > 0)
 227                 de->rec_len = cpu_to_le16(len);
 228         else
 229 -               assert(le16_to_cpu(de->rec_len) >= EXT3_DIR_REC_LEN(2));
 230 +               assert(le16_to_cpu(de->rec_len) >= __EXT3_DIR_REC_LEN(2));
 231         de->name_len = 2;
 232         strcpy (de->name, "..");
 233         ext3_set_de_type(dir->i_sb, de, S_IFDIR);
 234 -
 235 +       if (data) {
 236 +               de->name[2] = 0;
 237 +               memcpy(&de->name[2 + 1], data, dlen);
 238 +               de->file_type |= EXT3_DIRENT_LUFID;
 239 +       }
 240  out_journal:
 241         if (journal) {
 242                 BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
 243 @@ -1958,12 +1994,12 @@ retry:
 244
 245  /* Initialize @inode as a subdirectory of @dir, and add the
 246   * "." and ".." entries into the first directory block. */
 247 -int ext3_add_dot_dotdot(handle_t *handle, struct inode * dir,
 248 -                        struct inode *inode)
 249 +int ext3_add_dot_dotdot(handle_t *handle, struct inode * dir, struct inode *inode,
 250 +                       const void *data1, const void *data2)
 251  {
 252         struct buffer_head * dir_block;
 253         struct ext3_dir_entry_2 * de;
 254 -       int err = 0;
 255 +       int err = 0, dot_reclen;
 256
 257         if (IS_ERR(handle))
 258                 return PTR_ERR(handle);
 259 @@ -1983,16 +2019,36 @@ int ext3_add_dot_dotdot(handle_t *handle
 260         de = (struct ext3_dir_entry_2 *) dir_block->b_data;
 261         de->inode = cpu_to_le32(inode->i_ino);
 262         de->name_len = 1;
 263 -       de->rec_len = cpu_to_le16(EXT3_DIR_REC_LEN(de->name_len));
 264 -       strcpy (de->name, ".");
 265         ext3_set_de_type(dir->i_sb, de, S_IFDIR);
 266 +       strcpy (de->name, ".");
 267 +
 268 +       /* get packed fid data*/
 269 +       data1 = ext3_dentry_get_data(dir->i_sb,
 270 +                       (struct ext3_dentry_param *) data1);
 271 +       if (data1) {
 272 +               de->name[1] = 0;
 273 +               memcpy(&de->name[2], data1, *(char*) data1);
 274 +               de->file_type |= EXT3_DIRENT_LUFID;
 275 +       }
 276 +       de->rec_len = cpu_to_le16(EXT3_DIR_REC_LEN(de));
 277 +       dot_reclen = cpu_to_le16(de->rec_len);
 278 +
 279         de = (struct ext3_dir_entry_2 *)
 280                         ((char *) de + le16_to_cpu(de->rec_len));
 281         de->inode = cpu_to_le32(dir->i_ino);
 282 -       de->rec_len = cpu_to_le16(inode->i_sb->s_blocksize-EXT3_DIR_REC_LEN(1));
 283 +       de->rec_len = cpu_to_le16(inode->i_sb->s_blocksize-dot_reclen);
 284         de->name_len = 2;
 285         strcpy (de->name, "..");
 286         ext3_set_de_type(dir->i_sb, de, S_IFDIR);
 287 +
 288 +       /* get packed fid data*/
 289 +       data2 = ext3_dentry_get_data(dir->i_sb,
 290 +                       (struct ext3_dentry_param *) data2);
 291 +       if (data2) {
 292 +               de->name[2] = 0;
 293 +               memcpy(&de->name[3], data2, *(char*) data2);
 294 +               de->file_type |= EXT3_DIRENT_LUFID;
 295 +       }
 296         inode->i_nlink = 2;
 297         BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
 298         ext3_journal_dirty_metadata(handle, dir_block);
 299 @@ -2029,7 +2085,7 @@ retry:
 300         if (IS_ERR(inode))
 301                 goto out_stop;
 302
 303 -       err = ext3_add_dot_dotdot(handle, dir, inode);
 304 +       err = ext3_add_dot_dotdot(handle, dir, inode, NULL, NULL);
 305         if (err) {
 306                 inode->i_nlink = 0;
 307                 ext3_mark_inode_dirty(handle, inode);
 308 @@ -2067,7 +2123,7 @@ static int empty_dir (struct inode * ino
 309         int err = 0;
 310
 311         sb = inode->i_sb;
 312 -       if (inode->i_size < EXT3_DIR_REC_LEN(1) + EXT3_DIR_REC_LEN(2) ||
 313 +       if (inode->i_size < __EXT3_DIR_REC_LEN(1) + __EXT3_DIR_REC_LEN(2) ||
 314             !(bh = ext3_bread (NULL, inode, 0, 0, &err))) {
 315                 if (err)
 316                         ext3_error(inode->i_sb, __FUNCTION__,
 317 Index: b/include/linux/ext3_fs.h
 318 ===================================================================
 319 --- a/include/linux/ext3_fs.h
 320 +++ b/include/linux/ext3_fs.h
 321 @@ -717,13 +717,16 @@ static inline int ext3_valid_inum(struct
 322  #define EXT3_FEATURE_INCOMPAT_META_BG          0x0010
 323  #define EXT3_FEATURE_INCOMPAT_EXTENTS          0x0040 /* extents support */
 324  #define EXT3_FEATURE_INCOMPAT_MMP              0x0100
 325 +#define EXT3_FEATURE_INCOMPAT_DIRDATA          0x1000
 326
 327  #define EXT3_FEATURE_COMPAT_SUPP       EXT2_FEATURE_COMPAT_EXT_ATTR
 328  #define EXT3_FEATURE_INCOMPAT_SUPP     (EXT3_FEATURE_INCOMPAT_FILETYPE| \
 329                                          EXT3_FEATURE_INCOMPAT_RECOVER| \
 330                                          EXT3_FEATURE_INCOMPAT_META_BG| \
 331                                          EXT3_FEATURE_INCOMPAT_EXTENTS| \
 332 -                                        EXT3_FEATURE_INCOMPAT_MMP)
 333 +                                        EXT3_FEATURE_INCOMPAT_MMP| \
 334 +                                        EXT3_FEATURE_INCOMPAT_DIRDATA)
 335 +
 336  #define EXT3_FEATURE_RO_COMPAT_SUPP    (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
 337                                          EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
 338                                          EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
 339 @@ -790,7 +793,44 @@ struct ext3_dir_entry_2 {
 340  #define EXT3_FT_SYMLINK                7
 341
 342  #define EXT3_FT_MAX            8
 343 +#define EXT3_FT_MASK           0xf
 344 +
 345 +#if EXT3_FT_MAX > EXT3_FT_MASK
 346 +#error "conflicting EXT3_FT_MAX and EXT3_FT_MASK"
 347 +#endif
 348 +
 349 +#define EXT3_LUFID_MAGIC    0xAD200907UL
 350 +struct ext3_dentry_param {
 351 +       __u32  edp_magic;       /* EXT3_LUFID_MAGIC */
 352 +       char   edp_len;         /* size of edp_data in bytes */
 353 +       char   edp_data[0];     /* packed array of data */
 354 +} __attribute__((packed));
 355 +
 356 +static inline unsigned char *ext3_dentry_get_data(struct super_block *sb,
 357 +                                               struct ext3_dentry_param* p)
 358 +
 359 +{
 360 +       if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_DIRDATA))
 361 +               return NULL;
 362 +       if (p && p->edp_magic == EXT3_LUFID_MAGIC)
 363 +               return &p->edp_len;
 364 +       else
 365 +               return NULL;
 366 +}
 367 +
 368 +/*
 369 + * d_type has 4 unused bits, so it can hold four types data. these different
 370 + * type of data (e.g. lustre data, high 32 bits of 64-bit inode number) can be
 371 + * stored, in flag order, after file-name in ext3 dirent.
 372 +*/
 373 +/*
 374 + * this flag is added to d_type if ext3 dirent has extra data after
 375 + * filename. this data length is variable and length is stored in first byte
 376 + * of data. data start after filename NUL byte.
 377 + * This is used by Lustre FS.
 378 + */
 379
 380 +#define EXT3_DIRENT_LUFID              0x10
 381  /*
 382   * EXT3_DIR_PAD defines the directory entries boundaries
 383   *
 384 @@ -798,8 +838,12 @@ struct ext3_dir_entry_2 {
 385   */
 386  #define EXT3_DIR_PAD                   4
 387  #define EXT3_DIR_ROUND                 (EXT3_DIR_PAD - 1)
 388 -#define EXT3_DIR_REC_LEN(name_len)     (((name_len) + 8 + EXT3_DIR_ROUND) & \
 389 +#define __EXT3_DIR_REC_LEN(len)                (((len) + 8 + EXT3_DIR_ROUND) & \
 390                                          ~EXT3_DIR_ROUND)
 391 +
 392 +#define EXT3_DIR_REC_LEN(de)           (__EXT3_DIR_REC_LEN(de->name_len +\
 393 +                                         ext3_get_dirent_data_len(de)))
 394 +
 395  /*
 396   * Hash Tree Directory indexing
 397   * (c) Daniel Phillips, 2001
 398 @@ -1125,7 +1169,8 @@ extern struct buffer_head * ext3_find_en
 399                                             struct ext3_dir_entry_2
 400                                             ** res_dir);
 401  extern int ext3_add_dot_dotdot(handle_t *handle, struct inode *dir,
 402 -                              struct inode *inode);
 403 +               struct inode *inode, const void *data1,
 404 +               const void *data2);
 405  extern struct inode_operations ext3_dir_inode_operations;
 406  extern struct inode_operations ext3_special_inode_operations;
 407  extern struct buffer_head *ext3_append(handle_t *handle, struct inode *inode,
 408 @@ -1159,6 +1204,29 @@ ext3_get_blocks_wrap(handle_t *handle, s
 409         return ret;
 410  }
 411
 412 +/*
 413 + * Compute the total directory entry data length.
 414 + * This includes the filename and an implicit NUL terminator (always present),
 415 + * and optional extensions.  Each extension has a bit set in the high 4 bits of
 416 + * de->file_type, and the extension length is the first byte in each entry.
 417 + */
 418 +
 419 +static inline int ext3_get_dirent_data_len(struct ext3_dir_entry_2 *de)
 420 +{
 421 +       char *len = de->name + de->name_len + 1 /* NUL terminator */;
 422 +       int dlen = 0;
 423 +       __u8 extra_data_flags = (de->file_type & ~EXT3_FT_MASK) >> 4;
 424 +
 425 +       while (extra_data_flags) {
 426 +               if (extra_data_flags & 1) {
 427 +                       dlen += *len + (dlen == 0);
 428 +                       len += *len;
 429 +               }
 430 +               extra_data_flags >>= 1;
 431 +       }
 432 +       return dlen;
 433 +}
 434 +
 435  #endif /* __KERNEL__ */
 436
 437  /* EXT3_IOC_CREATE_INUM at bottom of file (visible to kernel and user). */
 438 Index: b/fs/ext3/dir.c
 439 ===================================================================
 440 --- a/fs/ext3/dir.c
 441 +++ b/fs/ext3/dir.c
 442 @@ -53,11 +53,17 @@ const struct file_operations ext3_dir_op
 443
 444  static unsigned char get_dtype(struct super_block *sb, int filetype)
 445  {
 446 +       int fl_index = filetype & EXT3_FT_MASK;
 447 +
 448         if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_FILETYPE) ||
 449 -           (filetype >= EXT3_FT_MAX))
 450 +           (fl_index >= EXT3_FT_MAX))
 451                 return DT_UNKNOWN;
 452
 453 -       return (ext3_filetype_table[filetype]);
 454 +       if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_DIRDATA))
 455 +               return (ext3_filetype_table[fl_index]);
 456 +
 457 +       return (ext3_filetype_table[fl_index]) |
 458 +                (filetype & EXT3_DIRENT_LUFID);
 459  }
 460
 461
 462 @@ -69,11 +75,11 @@ int ext3_check_dir_entry (const char * f
 463         const char * error_msg = NULL;
 464         const int rlen = le16_to_cpu(de->rec_len);
 465
 466 -       if (rlen < EXT3_DIR_REC_LEN(1))
 467 +       if (rlen < __EXT3_DIR_REC_LEN(1))
 468                 error_msg = "rec_len is smaller than minimal";
 469         else if (rlen % 4 != 0)
 470                 error_msg = "rec_len % 4 != 0";
 471 -       else if (rlen < EXT3_DIR_REC_LEN(de->name_len))
 472 +       else if (rlen < EXT3_DIR_REC_LEN(de))
 473                 error_msg = "rec_len is too small for name_len";
 474         else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
 475                 error_msg = "directory entry across blocks";
 476 @@ -177,7 +183,7 @@ revalidate:
 477                                  * failure will be detected in the
 478                                  * dirent test below. */
 479                                 if (le16_to_cpu(de->rec_len) <
 480 -                                               EXT3_DIR_REC_LEN(1))
 481 +                                               __EXT3_DIR_REC_LEN(1))
 482                                         break;
 483                                 i += le16_to_cpu(de->rec_len);
 484                         }
 485 @@ -210,7 +216,6 @@ revalidate:
 486                                  * during the copy operation.
 487                                  */
 488                                 unsigned long version = filp->f_version;
 489 -
 490                                 error = filldir(dirent, de->name,
 491                                                 de->name_len,
 492                                                 filp->f_pos,
 493 @@ -342,13 +347,17 @@ int ext3_htree_store_dirent(struct file
 494         struct rb_node **p, *parent = NULL;
 495         struct fname * fname, *new_fn;
 496         struct dir_private_info *info;
 497 +       int extra_data = 1;
 498         int len;
 499
 500         info = (struct dir_private_info *) dir_file->private_data;
 501         p = &info->root.rb_node;
 502
 503         /* Create and allocate the fname structure */
 504 -       len = sizeof(struct fname) + dirent->name_len + 1;
 505 +       if (dirent->file_type & EXT3_DIRENT_LUFID)
 506 +               extra_data = ext3_get_dirent_data_len(dirent);
 507 +
 508 +       len = sizeof(struct fname) + dirent->name_len + extra_data;
 509         new_fn = kmalloc(len, GFP_KERNEL);
 510         if (!new_fn)
 511                 return -ENOMEM;
 512 @@ -358,7 +367,7 @@ int ext3_htree_store_dirent(struct file
 513         new_fn->inode = le32_to_cpu(dirent->inode);
 514         new_fn->name_len = dirent->name_len;
 515         new_fn->file_type = dirent->file_type;
 516 -       memcpy(new_fn->name, dirent->name, dirent->name_len);
 517 +       memcpy(new_fn->name, dirent->name, dirent->name_len + extra_data);
 518         new_fn->name[dirent->name_len] = 0;
 519
 520         while (*p) {