ldiskfs/kernel_patches/patches/sles12/ext4-large-eas.patch

   1 This patch implements the large EA support in ext4. If the size of
   2 an EA value is larger than the blocksize, then the EA value would
   3 not be saved in the external EA block, instead it would be saved
   4 in an external EA inode. So, the patch also helps support a larger
   5 number of EAs.
   6
   7 Index: linux-stage/fs/ext4/ext4.h
   8 ===================================================================
   9 --- linux-stage.orig/fs/ext4/ext4.h
  10 +++ linux-stage/fs/ext4/ext4.h
  11 @@ -1545,6 +1545,7 @@ static inline void ext4_clear_state_flag
  12                                          EXT4_FEATURE_INCOMPAT_EXTENTS| \
  13                                          EXT4_FEATURE_INCOMPAT_64BIT| \
  14                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
  15 +                                        EXT4_FEATURE_INCOMPAT_EA_INODE| \
  16                                          EXT4_FEATURE_INCOMPAT_MMP |    \
  17                                          EXT4_FEATURE_INCOMPAT_DIRDATA| \
  18                                          EXT4_FEATURE_INCOMPAT_INLINE_DATA)
  19 @@ -1945,6 +1946,12 @@ struct mmpd_data {
  20  #define EXT4_MMP_MAX_CHECK_INTERVAL    300UL
  21
  22  /*
  23 + * Maximum size of xattr attributes for FEATURE_INCOMPAT_EA_INODE 1MB
  24 + * This limit is arbitrary, but is reasonable for the xattr API.
  25 + */
  26 +#define EXT4_XATTR_MAX_LARGE_EA_SIZE    (1024 * 1024)
  27 +
  28 +/*
  29   * Function prototypes
  30   */
  31
  32 @@ -1956,6 +1963,10 @@ struct mmpd_data {
  33  # define ATTRIB_NORET  __attribute__((noreturn))
  34  # define NORET_AND     noreturn,
  35
  36 +struct ext4_xattr_ino_array {
  37 +       unsigned int xia_count;         /* # of used item in the array */
  38 +       unsigned int xia_inodes[0];
  39 +};
  40  /* bitmap.c */
  41  extern unsigned int ext4_count_free(char *bitmap, unsigned numchars);
  42  void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
  43 @@ -2169,6 +2180,7 @@ extern void ext4_set_inode_flags(struct
  44  extern void ext4_get_inode_flags(struct ext4_inode_info *);
  45  extern int ext4_alloc_da_blocks(struct inode *inode);
  46  extern void ext4_set_aops(struct inode *inode);
  47 +extern int ext4_meta_trans_blocks(struct inode *, int nrblocks, int chunk);
  48  extern int ext4_writepage_trans_blocks(struct inode *);
  49  extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
  50  extern int ext4_block_truncate_page(handle_t *handle,
  51 Index: linux-stage/fs/ext4/inode.c
  52 ===================================================================
  53 --- linux-stage.orig/fs/ext4/inode.c
  54 +++ linux-stage/fs/ext4/inode.c
  55 @@ -135,8 +135,6 @@ static void ext4_invalidatepage(struct p
  56                                 unsigned int length);
  57  static int __ext4_journalled_writepage(struct page *page, unsigned int len);
  58  static int ext4_bh_delay_or_unwritten(handle_t *handle, struct buffer_head *bh);
  59 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
  60 -                                 int pextents);
  61
  62  /*
  63   * Test whether an inode is a fast symlink.
  64 @@ -182,6 +180,8 @@ void ext4_evict_inode(struct inode *inod
  65  {
  66         handle_t *handle;
  67         int err;
  68 +       int extra_credits = 3;
  69 +       struct ext4_xattr_ino_array *lea_ino_array = NULL;
  70
  71         trace_ext4_evict_inode(inode);
  72
  73 @@ -235,8 +235,8 @@ void ext4_evict_inode(struct inode *inod
  74          * protection against it
  75          */
  76         sb_start_intwrite(inode->i_sb);
  77 -       handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE,
  78 -                                   ext4_blocks_for_truncate(inode)+3);
  79 +
  80 +       handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, extra_credits);
  81         if (IS_ERR(handle)) {
  82                 ext4_std_error(inode->i_sb, PTR_ERR(handle));
  83                 /*
  84 @@ -251,6 +251,32 @@ void ext4_evict_inode(struct inode *inod
  85
  86         if (IS_SYNC(inode))
  87                 ext4_handle_sync(handle);
  88 +
  89 +       /* Delete xattr inode before deleting the main inode. */
  90 +       err = ext4_xattr_delete_inode(handle, inode, &lea_ino_array);
  91 +       if (err) {
  92 +               ext4_warning(inode->i_sb,
  93 +                            "couldn't delete inode's xattr (err %d)", err);
  94 +               goto stop_handle;
  95 +       }
  96 +
  97 +       if (!IS_NOQUOTA(inode))
  98 +               extra_credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
  99 +
 100 +       if (!ext4_handle_has_enough_credits(handle,
 101 +                       ext4_blocks_for_truncate(inode) + extra_credits)) {
 102 +               err = ext4_journal_extend(handle,
 103 +                       ext4_blocks_for_truncate(inode) + extra_credits);
 104 +               if (err > 0)
 105 +                       err = ext4_journal_restart(handle,
 106 +                       ext4_blocks_for_truncate(inode) + extra_credits);
 107 +               if (err != 0) {
 108 +                       ext4_warning(inode->i_sb,
 109 +                                    "couldn't extend journal (err %d)", err);
 110 +                       goto stop_handle;
 111 +               }
 112 +       }
 113 +
 114         inode->i_size = 0;
 115         err = ext4_mark_inode_dirty(handle, inode);
 116         if (err) {
 117 @@ -307,6 +334,9 @@ void ext4_evict_inode(struct inode *inod
 118                 ext4_free_inode(handle, inode);
 119         ext4_journal_stop(handle);
 120         sb_end_intwrite(inode->i_sb);
 121 +
 122 +       if (lea_ino_array != NULL)
 123 +               ext4_xattr_inode_array_free(inode, lea_ino_array);
 124         return;
 125  no_delete:
 126         ext4_clear_inode(inode);        /* We must guarantee clearing of inode... */
 127 @@ -4777,7 +4807,7 @@ static int ext4_index_trans_blocks(struc
 128   *
 129   * Also account for superblock, inode, quota and xattr blocks
 130   */
 131 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
 132 +int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
 133                                   int pextents)
 134  {
 135         ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb);
 136 Index: linux-stage/fs/ext4/xattr.c
 137 ===================================================================
 138 --- linux-stage.orig/fs/ext4/xattr.c
 139 +++ linux-stage/fs/ext4/xattr.c
 140 @@ -233,19 +233,26 @@ ext4_xattr_check_block(struct inode *ino
 141  }
 142
 143  static inline int
 144 -ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size)
 145 +ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size,
 146 +                      struct inode *inode)
 147  {
 148         size_t value_size = le32_to_cpu(entry->e_value_size);
 149
 150 -       if (entry->e_value_block != 0 || value_size > size ||
 151 +       if (!entry->e_value_inum &&
 152             le16_to_cpu(entry->e_value_offs) + value_size > size)
 153 +               return -EIO;
 154 +       if (entry->e_value_inum &&
 155 +           (le32_to_cpu(entry->e_value_inum) < EXT4_FIRST_INO(inode->i_sb) ||
 156 +            le32_to_cpu(entry->e_value_inum) >
 157 +            le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_inodes_count)))
 158                 return -EIO;
 159         return 0;
 160  }
 161
 162  static int
 163  ext4_xattr_find_entry(struct ext4_xattr_entry **pentry, int name_index,
 164 -                     const char *name, size_t size, int sorted)
 165 +                     const char *name, size_t size, int sorted,
 166 +                     struct inode *inode)
 167  {
 168         struct ext4_xattr_entry *entry;
 169         size_t name_len;
 170 @@ -265,11 +272,109 @@ ext4_xattr_find_entry(struct ext4_xattr_
 171                         break;
 172         }
 173         *pentry = entry;
 174 -       if (!cmp && ext4_xattr_check_entry(entry, size))
 175 +       if (!cmp && ext4_xattr_check_entry(entry, size, inode))
 176                         return -EIO;
 177         return cmp ? -ENODATA : 0;
 178  }
 179
 180 +/*
 181 + * Read the EA value from an inode.
 182 + */
 183 +static int ext4_xattr_inode_read(struct inode *ea_inode, void *buf, size_t *size)
 184 +{
 185 +       unsigned long block = 0;
 186 +       struct buffer_head *bh = NULL;
 187 +       int err, blocksize;
 188 +       size_t csize, ret_size = 0;
 189 +
 190 +       if (*size == 0)
 191 +               return 0;
 192 +
 193 +       blocksize = ea_inode->i_sb->s_blocksize;
 194 +
 195 +       while (ret_size < *size) {
 196 +               csize = (*size - ret_size) > blocksize ? blocksize :
 197 +                                                       *size - ret_size;
 198 +               bh = ext4_bread(NULL, ea_inode, block, 0, &err);
 199 +               if (!bh) {
 200 +                       *size = ret_size;
 201 +                       return err;
 202 +               }
 203 +               memcpy(buf, bh->b_data, csize);
 204 +               brelse(bh);
 205 +
 206 +               buf += csize;
 207 +               block += 1;
 208 +               ret_size += csize;
 209 +       }
 210 +
 211 +       *size = ret_size;
 212 +
 213 +       return err;
 214 +}
 215 +
 216 +/*
 217 + * Fetch the xattr inode from disk.
 218 + *
 219 + * The xattr inode stores the parent inode number and generation so that
 220 + * the kernel and e2fsck can verify the xattr inode is valid upon access.
 221 + */
 222 +struct inode *ext4_xattr_inode_iget(struct inode *parent,
 223 +                                   unsigned long ea_ino, int *err)
 224 +{
 225 +       struct inode *ea_inode = NULL;
 226 +
 227 +       ea_inode = ext4_iget(parent->i_sb, ea_ino);
 228 +       if (IS_ERR(ea_inode) || is_bad_inode(ea_inode)) {
 229 +               int rc = IS_ERR(ea_inode) ? PTR_ERR(ea_inode) : 0;
 230 +               ext4_error(parent->i_sb, "error while reading EA inode %lu "
 231 +                          "/ %d %d", ea_ino, rc, is_bad_inode(ea_inode));
 232 +               *err = rc != 0 ? rc : -EIO;
 233 +               return NULL;
 234 +       }
 235 +
 236 +       if (EXT4_XATTR_INODE_GET_PARENT(ea_inode) != parent->i_ino ||
 237 +           ea_inode->i_generation != parent->i_generation) {
 238 +               ext4_error(parent->i_sb, "Backpointer from EA inode %lu "
 239 +                          "to parent invalid.", ea_ino);
 240 +               *err = -EINVAL;
 241 +               goto error;
 242 +       }
 243 +
 244 +       if (!(EXT4_I(ea_inode)->i_flags & EXT4_EA_INODE_FL)) {
 245 +               ext4_error(parent->i_sb, "EA inode %lu does not have "
 246 +                          "EXT4_EA_INODE_FL flag set.\n", ea_ino);
 247 +               *err = -EINVAL;
 248 +               goto error;
 249 +       }
 250 +
 251 +       *err = 0;
 252 +       return ea_inode;
 253 +
 254 +error:
 255 +       iput(ea_inode);
 256 +       return NULL;
 257 +}
 258 +
 259 +/*
 260 + * Read the value from the EA inode.
 261 + */
 262 +static int ext4_xattr_inode_get(struct inode *inode, unsigned long ea_ino,
 263 +                               void *buffer, size_t *size)
 264 +{
 265 +       struct inode *ea_inode = NULL;
 266 +       int err;
 267 +
 268 +       ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
 269 +       if (err)
 270 +               return err;
 271 +
 272 +       err = ext4_xattr_inode_read(ea_inode, buffer, size);
 273 +       iput(ea_inode);
 274 +
 275 +       return err;
 276 +}
 277 +
 278  static int
 279  ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,
 280                      void *buffer, size_t buffer_size)
 281 @@ -301,7 +400,8 @@ bad_block:
 282         }
 283         ext4_xattr_cache_insert(bh);
 284         entry = BFIRST(bh);
 285 -       error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1);
 286 +       error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1,
 287 +                                     inode);
 288         if (error == -EIO)
 289                 goto bad_block;
 290         if (error)
 291 @@ -311,8 +411,16 @@ bad_block:
 292                 error = -ERANGE;
 293                 if (size > buffer_size)
 294                         goto cleanup;
 295 -               memcpy(buffer, bh->b_data + le16_to_cpu(entry->e_value_offs),
 296 -                      size);
 297 +               if (entry->e_value_inum) {
 298 +                       error = ext4_xattr_inode_get(inode,
 299 +                                            le32_to_cpu(entry->e_value_inum),
 300 +                                            buffer, &size);
 301 +                       if (error)
 302 +                               goto cleanup;
 303 +               } else {
 304 +                       memcpy(buffer, bh->b_data +
 305 +                              le16_to_cpu(entry->e_value_offs), size);
 306 +               }
 307         }
 308         error = size;
 309
 310 @@ -346,7 +454,7 @@ ext4_xattr_ibody_get(struct inode *inode
 311         if (error)
 312                 goto cleanup;
 313         error = ext4_xattr_find_entry(&entry, name_index, name,
 314 -                                     end - (void *)entry, 0);
 315 +                                     end - (void *)entry, 0, inode);
 316         if (error)
 317                 goto cleanup;
 318         size = le32_to_cpu(entry->e_value_size);
 319 @@ -354,8 +462,16 @@ ext4_xattr_ibody_get(struct inode *inode
 320                 error = -ERANGE;
 321                 if (size > buffer_size)
 322                         goto cleanup;
 323 -               memcpy(buffer, (void *)IFIRST(header) +
 324 -                      le16_to_cpu(entry->e_value_offs), size);
 325 +               if (entry->e_value_inum) {
 326 +                       error = ext4_xattr_inode_get(inode,
 327 +                                            le32_to_cpu(entry->e_value_inum),
 328 +                                            buffer, &size);
 329 +                       if (error)
 330 +                               goto cleanup;
 331 +               } else {
 332 +                       memcpy(buffer, (void *)IFIRST(header) +
 333 +                              le16_to_cpu(entry->e_value_offs), size);
 334 +               }
 335         }
 336         error = size;
 337
 338 @@ -597,7 +713,7 @@ static size_t ext4_xattr_free_space(stru
 339  {
 340         for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
 341                 *total += EXT4_XATTR_LEN(last->e_name_len);
 342 -               if (!last->e_value_block && last->e_value_size) {
 343 +               if (!last->e_value_inum && last->e_value_size) {
 344                         size_t offs = le16_to_cpu(last->e_value_offs);
 345                         if (offs < *min_offs)
 346                                 *min_offs = offs;
 347 @@ -606,16 +722,172 @@ static size_t ext4_xattr_free_space(stru
 348         return (*min_offs - ((void *)last - base) - sizeof(__u32));
 349  }
 350
 351 +/*
 352 + * Write the value of the EA in an inode.
 353 + */
 354  static int
 355 -ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s)
 356 +ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode,
 357 +                      const void *buf, int bufsize)
 358 +{
 359 +       struct buffer_head *bh = NULL;
 360 +       unsigned long block = 0;
 361 +       unsigned blocksize = ea_inode->i_sb->s_blocksize;
 362 +       unsigned max_blocks = (bufsize + blocksize - 1) >> ea_inode->i_blkbits;
 363 +       int csize, wsize = 0;
 364 +       int ret = 0;
 365 +       int retries = 0;
 366 +
 367 +retry:
 368 +       while (ret >= 0 && ret < max_blocks) {
 369 +               struct ext4_map_blocks map;
 370 +               map.m_lblk = block += ret;
 371 +               map.m_len = max_blocks -= ret;
 372 +
 373 +               ret = ext4_map_blocks(handle, ea_inode, &map,
 374 +                                     EXT4_GET_BLOCKS_CREATE);
 375 +               if (ret <= 0) {
 376 +                       ext4_mark_inode_dirty(handle, ea_inode);
 377 +                       if (ret == -ENOSPC &&
 378 +                           ext4_should_retry_alloc(ea_inode->i_sb, &retries)) {
 379 +                               ret = 0;
 380 +                               goto retry;
 381 +                       }
 382 +                       break;
 383 +               }
 384 +       }
 385 +
 386 +       if (ret < 0)
 387 +               return ret;
 388 +
 389 +       block = 0;
 390 +       while (wsize < bufsize) {
 391 +               if (bh != NULL)
 392 +                       brelse(bh);
 393 +               csize = (bufsize - wsize) > blocksize ? blocksize :
 394 +                                                               bufsize - wsize;
 395 +               bh = ext4_getblk(handle, ea_inode, block, 0, &ret);
 396 +               if (!bh)
 397 +                       goto out;
 398 +               ret = ext4_journal_get_write_access(handle, bh);
 399 +               if (ret)
 400 +                       goto out;
 401 +
 402 +               memcpy(bh->b_data, buf, csize);
 403 +               set_buffer_uptodate(bh);
 404 +               ext4_handle_dirty_metadata(handle, ea_inode, bh);
 405 +
 406 +               buf += csize;
 407 +               wsize += csize;
 408 +               block += 1;
 409 +       }
 410 +
 411 +       i_size_write(ea_inode, wsize);
 412 +       ext4_update_i_disksize(ea_inode, wsize);
 413 +
 414 +       ext4_mark_inode_dirty(handle, ea_inode);
 415 +
 416 +out:
 417 +       brelse(bh);
 418 +
 419 +       return ret;
 420 +}
 421 +
 422 +/*
 423 + * Create an inode to store the value of a large EA.
 424 + */
 425 +static struct inode *
 426 +ext4_xattr_inode_create(handle_t *handle, struct inode *inode)
 427 +{
 428 +       struct inode *ea_inode = NULL;
 429 +
 430 +       /*
 431 +        * Let the next inode be the goal, so we try and allocate the EA inode
 432 +        * in the same group, or nearby one.
 433 +        */
 434 +       ea_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode,
 435 +                                 S_IFREG|0600, NULL, inode->i_ino + 1, NULL);
 436 +
 437 +       if (!IS_ERR(ea_inode)) {
 438 +               ea_inode->i_op = &ext4_file_inode_operations;
 439 +               ea_inode->i_fop = &ext4_file_operations;
 440 +               ext4_set_aops(ea_inode);
 441 +               ea_inode->i_generation = inode->i_generation;
 442 +               EXT4_I(ea_inode)->i_flags |= EXT4_EA_INODE_FL;
 443 +
 444 +               /*
 445 +                * A back-pointer from EA inode to parent inode will be useful
 446 +                * for e2fsck.
 447 +                */
 448 +               EXT4_XATTR_INODE_SET_PARENT(ea_inode, inode->i_ino);
 449 +               unlock_new_inode(ea_inode);
 450 +       }
 451 +
 452 +       return ea_inode;
 453 +}
 454 +
 455 +/*
 456 + * Unlink the inode storing the value of the EA.
 457 + */
 458 +int
 459 +ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino)
 460 +{
 461 +       struct inode *ea_inode = NULL;
 462 +       int err;
 463 +
 464 +       ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
 465 +       if (err)
 466 +               return err;
 467 +
 468 +       clear_nlink(ea_inode);
 469 +       iput(ea_inode);
 470 +
 471 +       return 0;
 472 +}
 473 +
 474 +/*
 475 + * Add value of the EA in an inode.
 476 + */
 477 +static int
 478 +ext4_xattr_inode_set(handle_t *handle, struct inode *inode, unsigned long *ea_ino,
 479 +                    const void *value, size_t value_len)
 480 +{
 481 +       struct inode *ea_inode = NULL;
 482 +       int err;
 483 +
 484 +       /* Create an inode for the EA value */
 485 +       ea_inode = ext4_xattr_inode_create(handle, inode);
 486 +       if (IS_ERR(ea_inode))
 487 +               return -1;
 488 +
 489 +       err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);
 490 +       if (err)
 491 +               clear_nlink(ea_inode);
 492 +       else
 493 +               *ea_ino = ea_inode->i_ino;
 494 +
 495 +       iput(ea_inode);
 496 +
 497 +       return err;
 498 +}
 499 +
 500 +static int
 501 +ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s,
 502 +                    handle_t *handle, struct inode *inode)
 503  {
 504         struct ext4_xattr_entry *last;
 505         size_t free, min_offs = s->end - s->base, name_len = strlen(i->name);
 506 +       int in_inode = i->in_inode;
 507 +
 508 +       if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
 509 +                EXT4_FEATURE_INCOMPAT_EA_INODE) &&
 510 +           (EXT4_XATTR_SIZE(i->value_len) >
 511 +            EXT4_XATTR_MIN_LARGE_EA_SIZE(inode->i_sb->s_blocksize)))
 512 +               in_inode = 1;
 513
 514         /* Compute min_offs and last. */
 515         last = s->first;
 516         for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
 517 -               if (!last->e_value_block && last->e_value_size) {
 518 +               if (!last->e_value_inum && last->e_value_size) {
 519                         size_t offs = le16_to_cpu(last->e_value_offs);
 520                         if (offs < min_offs)
 521                                 min_offs = offs;
 522 @@ -623,16 +895,21 @@ ext4_xattr_set_entry(struct ext4_xattr_i
 523         }
 524         free = min_offs - ((void *)last - s->base) - sizeof(__u32);
 525         if (!s->not_found) {
 526 -               if (!s->here->e_value_block && s->here->e_value_size) {
 527 +               if (!in_inode &&
 528 +                   !s->here->e_value_inum && s->here->e_value_size) {
 529                         size_t size = le32_to_cpu(s->here->e_value_size);
 530                         free += EXT4_XATTR_SIZE(size);
 531                 }
 532                 free += EXT4_XATTR_LEN(name_len);
 533         }
 534         if (i->value) {
 535 -               if (free < EXT4_XATTR_SIZE(i->value_len) ||
 536 -                   free < EXT4_XATTR_LEN(name_len) +
 537 -                          EXT4_XATTR_SIZE(i->value_len))
 538 +               size_t value_len = EXT4_XATTR_SIZE(i->value_len);
 539 +
 540 +               if (in_inode)
 541 +                       value_len = 0;
 542 +
 543 +               if (free < value_len ||
 544 +                   free < EXT4_XATTR_LEN(name_len) + value_len)
 545                         return -ENOSPC;
 546         }
 547
 548 @@ -646,7 +923,8 @@ ext4_xattr_set_entry(struct ext4_xattr_i
 549                 s->here->e_name_len = name_len;
 550                 memcpy(s->here->e_name, i->name, name_len);
 551         } else {
 552 -               if (!s->here->e_value_block && s->here->e_value_size) {
 553 +               if (!s->here->e_value_inum && s->here->e_value_size &&
 554 +                   s->here->e_value_offs > 0) {
 555                         void *first_val = s->base + min_offs;
 556                         size_t offs = le16_to_cpu(s->here->e_value_offs);
 557                         void *val = s->base + offs;
 558 @@ -680,13 +958,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
 559                         last = s->first;
 560                         while (!IS_LAST_ENTRY(last)) {
 561                                 size_t o = le16_to_cpu(last->e_value_offs);
 562 -                               if (!last->e_value_block &&
 563 +                               if (!last->e_value_inum &&
 564                                     last->e_value_size && o < offs)
 565                                         last->e_value_offs =
 566                                                 cpu_to_le16(o + size);
 567                                 last = EXT4_XATTR_NEXT(last);
 568                         }
 569                 }
 570 +               if (s->here->e_value_inum) {
 571 +                       ext4_xattr_inode_unlink(inode,
 572 +                                       le32_to_cpu(s->here->e_value_inum));
 573 +                       s->here->e_value_inum = 0;
 574 +               }
 575                 if (!i->value) {
 576                         /* Remove the old name. */
 577                         size_t size = EXT4_XATTR_LEN(name_len);
 578 @@ -700,10 +982,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
 579         if (i->value) {
 580                 /* Insert the new value. */
 581                 s->here->e_value_size = cpu_to_le32(i->value_len);
 582 -               if (i->value_len) {
 583 +               if (in_inode) {
 584 +                       unsigned long ea_ino = le32_to_cpu(s->here->e_value_inum);
 585 +                       ext4_xattr_inode_set(handle, inode, &ea_ino, i->value,
 586 +                                            i->value_len);
 587 +                       s->here->e_value_inum = cpu_to_le32(ea_ino);
 588 +                       s->here->e_value_offs = 0;
 589 +               } else if (i->value_len) {
 590                         size_t size = EXT4_XATTR_SIZE(i->value_len);
 591                         void *val = s->base + min_offs - size;
 592                         s->here->e_value_offs = cpu_to_le16(min_offs - size);
 593 +                       s->here->e_value_inum = 0;
 594                         if (i->value == EXT4_ZERO_XATTR_VALUE) {
 595                                 memset(val, 0, size);
 596                         } else {
 597 @@ -753,7 +1042,7 @@ ext4_xattr_block_find(struct inode *inod
 598                 bs->s.end = bs->bh->b_data + bs->bh->b_size;
 599                 bs->s.here = bs->s.first;
 600                 error = ext4_xattr_find_entry(&bs->s.here, i->name_index,
 601 -                                             i->name, bs->bh->b_size, 1);
 602 +                                             i->name, bs->bh->b_size, 1, inode);
 603                 if (error && error != -ENODATA)
 604                         goto cleanup;
 605                 bs->s.not_found = error;
 606 @@ -777,8 +1066,6 @@ ext4_xattr_block_set(handle_t *handle, s
 607
 608  #define header(x) ((struct ext4_xattr_header *)(x))
 609
 610 -       if (i->value && i->value_len > sb->s_blocksize)
 611 -               return -ENOSPC;
 612         if (s->base) {
 613                 ce = mb_cache_entry_get(ext4_xattr_cache, bs->bh->b_bdev,
 614                                         bs->bh->b_blocknr);
 615 @@ -794,7 +1081,7 @@ ext4_xattr_block_set(handle_t *handle, s
 616                                 ce = NULL;
 617                         }
 618                         ea_bdebug(bs->bh, "modifying in-place");
 619 -                       error = ext4_xattr_set_entry(i, s);
 620 +                       error = ext4_xattr_set_entry(i, s, handle, inode);
 621                         if (!error) {
 622                                 if (!IS_LAST_ENTRY(s->first))
 623                                         ext4_xattr_rehash(header(s->base),
 624 @@ -845,7 +1132,7 @@ ext4_xattr_block_set(handle_t *handle, s
 625                 s->end = s->base + sb->s_blocksize;
 626         }
 627
 628 -       error = ext4_xattr_set_entry(i, s);
 629 +       error = ext4_xattr_set_entry(i, s, handle, inode);
 630         if (error == -EIO)
 631                 goto bad_block;
 632         if (error)
 633 @@ -994,7 +1281,7 @@ int ext4_xattr_ibody_find(struct inode *
 634                 /* Find the named attribute. */
 635                 error = ext4_xattr_find_entry(&is->s.here, i->name_index,
 636                                               i->name, is->s.end -
 637 -                                             (void *)is->s.base, 0);
 638 +                                             (void *)is->s.base, 0, inode);
 639                 if (error && error != -ENODATA)
 640                         return error;
 641                 is->s.not_found = error;
 642 @@ -1012,7 +1299,7 @@ int ext4_xattr_ibody_inline_set(handle_t
 643
 644         if (EXT4_I(inode)->i_extra_isize == 0)
 645                 return -ENOSPC;
 646 -       error = ext4_xattr_set_entry(i, s);
 647 +       error = ext4_xattr_set_entry(i, s, handle, inode);
 648         if (error) {
 649                 if (error == -ENOSPC &&
 650                     ext4_has_inline_data(inode)) {
 651 @@ -1024,7 +1311,7 @@ int ext4_xattr_ibody_inline_set(handle_t
 652                         error = ext4_xattr_ibody_find(inode, i, is);
 653                         if (error)
 654                                 return error;
 655 -                       error = ext4_xattr_set_entry(i, s);
 656 +                       error = ext4_xattr_set_entry(i, s, handle, inode);
 657                 }
 658                 if (error)
 659                         return error;
 660 @@ -1050,7 +1337,7 @@ static int ext4_xattr_ibody_set(handle_t
 661
 662         if (EXT4_I(inode)->i_extra_isize == 0)
 663                 return -ENOSPC;
 664 -       error = ext4_xattr_set_entry(i, s);
 665 +       error = ext4_xattr_set_entry(i, s, handle, inode);
 666         if (error)
 667                 return error;
 668         header = IHDR(inode, ext4_raw_inode(&is->iloc));
 669 @@ -1086,7 +1373,7 @@ ext4_xattr_set_handle(handle_t *handle,
 670                 .name = name,
 671                 .value = value,
 672                 .value_len = value_len,
 673 -
 674 +               .in_inode = 0,
 675         };
 676         struct ext4_xattr_ibody_find is = {
 677                 .s = { .not_found = -ENODATA, },
 678 @@ -1151,6 +1438,15 @@ ext4_xattr_set_handle(handle_t *handle,
 679                                         goto cleanup;
 680                         }
 681                         error = ext4_xattr_block_set(handle, inode, &i, &bs);
 682 +                       if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
 683 +                                       EXT4_FEATURE_INCOMPAT_EA_INODE) &&
 684 +                           error == -ENOSPC) {
 685 +                               /* xattr not fit to block, store at external
 686 +                                * inode */
 687 +                               i.in_inode = 1;
 688 +                               error = ext4_xattr_ibody_set(handle, inode,
 689 +                                                            &i, &is);
 690 +                       }
 691                         if (error)
 692                                 goto cleanup;
 693                         if (!is.s.not_found) {
 694 @@ -1197,9 +1493,22 @@ ext4_xattr_set(struct inode *inode, int
 695                const void *value, size_t value_len, int flags)
 696  {
 697         handle_t *handle;
 698 +       struct super_block *sb = inode->i_sb;
 699         int error, retries = 0;
 700         int credits = ext4_jbd2_credits_xattr(inode);
 701
 702 +       if ((value_len >= EXT4_XATTR_MIN_LARGE_EA_SIZE(sb->s_blocksize)) &&
 703 +           EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EA_INODE)) {
 704 +               int nrblocks = (value_len + sb->s_blocksize - 1) >>
 705 +                                       sb->s_blocksize_bits;
 706 +
 707 +               /* For new inode */
 708 +               credits += EXT4_SINGLEDATA_TRANS_BLOCKS(sb) + 3;
 709 +
 710 +               /* For data blocks of EA inode */
 711 +               credits += ext4_meta_trans_blocks(inode, nrblocks, 0);
 712 +       }
 713 +
 714  retry:
 715         handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);
 716         if (IS_ERR(handle)) {
 717 @@ -1211,7 +1520,7 @@ retry:
 718                                               value, value_len, flags);
 719                 error2 = ext4_journal_stop(handle);
 720                 if (error == -ENOSPC &&
 721 -                   ext4_should_retry_alloc(inode->i_sb, &retries))
 722 +                   ext4_should_retry_alloc(sb, &retries))
 723                         goto retry;
 724                 if (error == 0)
 725                         error = error2;
 726 @@ -1233,7 +1542,7 @@ static void ext4_xattr_shift_entries(str
 727
 728         /* Adjust the value offsets of the entries */
 729         for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
 730 -               if (!last->e_value_block && last->e_value_size) {
 731 +               if (!last->e_value_inum && last->e_value_size) {
 732                         new_offs = le16_to_cpu(last->e_value_offs) +
 733                                                         value_offs_shift;
 734                         BUG_ON(new_offs + le32_to_cpu(last->e_value_size)
 735 @@ -1472,21 +1781,135 @@ cleanup:
 736  }
 737
 738
 739 +#define EIA_INCR 16 /* must be 2^n */
 740 +#define EIA_MASK (EIA_INCR - 1)
 741 +/* Add the large xattr @ino into @lea_ino_array for later deletion.
 742 + * If @lea_ino_array is new or full it will be grown and the old
 743 + * contents copied over.
 744 + */
 745 +static int
 746 +ext4_expand_ino_array(struct ext4_xattr_ino_array **lea_ino_array, __u32 ino)
 747 +{
 748 +       if (*lea_ino_array == NULL) {
 749 +               /*
 750 +                * Start with 15 inodes, so it fits into a power-of-two size.
 751 +                * If *lea_ino_array is NULL, this is essentially offsetof()
 752 +                */
 753 +               (*lea_ino_array) =
 754 +                       kmalloc(offsetof(struct ext4_xattr_ino_array,
 755 +                                        xia_inodes[EIA_MASK]),
 756 +                               GFP_NOFS);
 757 +               if (*lea_ino_array == NULL)
 758 +                       return -ENOMEM;
 759 +               (*lea_ino_array)->xia_count = 0;
 760 +       } else if (((*lea_ino_array)->xia_count & EIA_MASK) == EIA_MASK) {
 761 +               /* expand the array once all 15 + n * 16 slots are full */
 762 +               struct ext4_xattr_ino_array *new_array = NULL;
 763 +               int count = (*lea_ino_array)->xia_count;
 764 +
 765 +               /* if new_array is NULL, this is essentially offsetof() */
 766 +               new_array = kmalloc(
 767 +                               offsetof(struct ext4_xattr_ino_array,
 768 +                                        xia_inodes[count + EIA_INCR]),
 769 +                               GFP_NOFS);
 770 +               if (new_array == NULL)
 771 +                       return -ENOMEM;
 772 +               memcpy(new_array, *lea_ino_array,
 773 +                      offsetof(struct ext4_xattr_ino_array,
 774 +                               xia_inodes[count]));
 775 +               kfree(*lea_ino_array);
 776 +               *lea_ino_array = new_array;
 777 +       }
 778 +       (*lea_ino_array)->xia_inodes[(*lea_ino_array)->xia_count++] = ino;
 779 +       return 0;
 780 +}
 781 +
 782 +/**
 783 + * Add xattr inode to orphan list
 784 + */
 785 +static int
 786 +ext4_xattr_inode_orphan_add(handle_t *handle, struct inode *inode,
 787 +                       int credits, struct ext4_xattr_ino_array *lea_ino_array)
 788 +{
 789 +       struct inode *ea_inode = NULL;
 790 +       int idx = 0, error = 0;
 791 +
 792 +       if (lea_ino_array == NULL)
 793 +               return 0;
 794 +
 795 +       for (; idx < lea_ino_array->xia_count; ++idx) {
 796 +               if (!ext4_handle_has_enough_credits(handle, credits)) {
 797 +                       error = ext4_journal_extend(handle, credits);
 798 +                       if (error > 0)
 799 +                               error = ext4_journal_restart(handle, credits);
 800 +
 801 +                       if (error != 0) {
 802 +                               ext4_warning(inode->i_sb,
 803 +                                       "couldn't extend journal "
 804 +                                       "(err %d)", error);
 805 +                               return error;
 806 +                       }
 807 +               }
 808 +               ea_inode = ext4_xattr_inode_iget(inode,
 809 +                               lea_ino_array->xia_inodes[idx], &error);
 810 +               if (error)
 811 +                       continue;
 812 +               ext4_orphan_add(handle, ea_inode);
 813 +               /* the inode's i_count will be released by caller */
 814 +       }
 815 +
 816 +       return 0;
 817 +}
 818
 819  /*
 820   * ext4_xattr_delete_inode()
 821   *
 822 - * Free extended attribute resources associated with this inode. This
 823 + * Free extended attribute resources associated with this inode. Traverse
 824 + * all entries and unlink any xattr inodes associated with this inode. This
 825   * is called immediately before an inode is freed. We have exclusive
 826 - * access to the inode.
 827 + * access to the inode. If an orphan inode is deleted it will also delete any
 828 + * xattr block and all xattr inodes. They are checked by ext4_xattr_inode_iget()
 829 + * to ensure they belong to the parent inode and were not deleted already.
 830   */
 831 -void
 832 -ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
 833 +int
 834 +ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
 835 +                       struct ext4_xattr_ino_array **lea_ino_array)
 836  {
 837         struct buffer_head *bh = NULL;
 838 +       struct ext4_xattr_ibody_header *header;
 839 +       struct ext4_inode *raw_inode;
 840 +       struct ext4_iloc iloc;
 841 +       struct ext4_xattr_entry *entry;
 842 +       int credits = 3, error = 0;
 843
 844 -       if (!EXT4_I(inode)->i_file_acl)
 845 +       if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR))
 846 +               goto delete_external_ea;
 847 +
 848 +       error = ext4_get_inode_loc(inode, &iloc);
 849 +       if (error)
 850                 goto cleanup;
 851 +       raw_inode = ext4_raw_inode(&iloc);
 852 +       header = IHDR(inode, raw_inode);
 853 +       for (entry = IFIRST(header); !IS_LAST_ENTRY(entry);
 854 +            entry = EXT4_XATTR_NEXT(entry)) {
 855 +               if (!entry->e_value_inum)
 856 +                       continue;
 857 +               if (ext4_expand_ino_array(lea_ino_array,
 858 +                                         entry->e_value_inum) != 0) {
 859 +                       brelse(iloc.bh);
 860 +                       goto cleanup;
 861 +               }
 862 +               entry->e_value_inum = 0;
 863 +       }
 864 +       brelse(iloc.bh);
 865 +
 866 +delete_external_ea:
 867 +       if (!EXT4_I(inode)->i_file_acl) {
 868 +               /* add xattr inode to orphan list */
 869 +               ext4_xattr_inode_orphan_add(handle, inode, credits,
 870 +                                               *lea_ino_array);
 871 +               goto cleanup;
 872 +       }
 873         bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
 874         if (!bh) {
 875                 EXT4_ERROR_INODE(inode, "block %llu read error",
 876 @@ -1499,11 +1922,69 @@ ext4_xattr_delete_inode(handle_t *handle
 877                                  EXT4_I(inode)->i_file_acl);
 878                 goto cleanup;
 879         }
 880 +
 881 +       for (entry = BFIRST(bh); !IS_LAST_ENTRY(entry);
 882 +            entry = EXT4_XATTR_NEXT(entry)) {
 883 +               if (!entry->e_value_inum)
 884 +                       continue;
 885 +               if (ext4_expand_ino_array(lea_ino_array,
 886 +                                         entry->e_value_inum) != 0)
 887 +                       goto cleanup;
 888 +               entry->e_value_inum = 0;
 889 +       }
 890 +
 891 +       /* add xattr inode to orphan list */
 892 +       error = ext4_xattr_inode_orphan_add(handle, inode, credits,
 893 +                                       *lea_ino_array);
 894 +       if (error != 0)
 895 +               goto cleanup;
 896 +
 897 +       if (!IS_NOQUOTA(inode))
 898 +               credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
 899 +
 900 +       if (!ext4_handle_has_enough_credits(handle, credits)) {
 901 +               error = ext4_journal_extend(handle, credits);
 902 +               if (error > 0)
 903 +                       error = ext4_journal_restart(handle, credits);
 904 +               if (error != 0) {
 905 +                       ext4_warning(inode->i_sb,
 906 +                               "couldn't extend journal (err %d)", error);
 907 +                       goto cleanup;
 908 +               }
 909 +       }
 910 +
 911         ext4_xattr_release_block(handle, inode, bh);
 912         EXT4_I(inode)->i_file_acl = 0;
 913
 914  cleanup:
 915         brelse(bh);
 916 +
 917 +       return error;
 918 +}
 919 +
 920 +void
 921 +ext4_xattr_inode_array_free(struct inode *inode,
 922 +                           struct ext4_xattr_ino_array *lea_ino_array)
 923 +{
 924 +       struct inode    *ea_inode = NULL;
 925 +       int             idx = 0;
 926 +       int             err;
 927 +
 928 +       if (lea_ino_array == NULL)
 929 +               return;
 930 +
 931 +       for (; idx < lea_ino_array->xia_count; ++idx) {
 932 +               ea_inode = ext4_xattr_inode_iget(inode,
 933 +                               lea_ino_array->xia_inodes[idx], &err);
 934 +               if (err)
 935 +                       continue;
 936 +               /* for inode's i_count get from ext4_xattr_delete_inode */
 937 +               if (!list_empty(&EXT4_I(ea_inode)->i_orphan))
 938 +                       iput(ea_inode);
 939 +               clear_nlink(ea_inode);
 940 +               iput(ea_inode);
 941 +       }
 942 +       kfree(lea_ino_array);
 943  }
 944
 945  /*
 946 @@ -1573,10 +2054,9 @@ ext4_xattr_cmp(struct ext4_xattr_header
 947                     entry1->e_name_index != entry2->e_name_index ||
 948                     entry1->e_name_len != entry2->e_name_len ||
 949                     entry1->e_value_size != entry2->e_value_size ||
 950 +                   entry1->e_value_inum != entry2->e_value_inum ||
 951                     memcmp(entry1->e_name, entry2->e_name, entry1->e_name_len))
 952                         return 1;
 953 -               if (entry1->e_value_block != 0 || entry2->e_value_block != 0)
 954 -                       return -EIO;
 955                 if (memcmp((char *)header1 + le16_to_cpu(entry1->e_value_offs),
 956                            (char *)header2 + le16_to_cpu(entry2->e_value_offs),
 957                            le32_to_cpu(entry1->e_value_size)))
 958 @@ -1660,7 +2140,7 @@ static inline void ext4_xattr_hash_entry
 959                        *name++;
 960         }
 961
 962 -       if (entry->e_value_block == 0 && entry->e_value_size != 0) {
 963 +       if (!entry->e_value_inum && entry->e_value_size) {
 964                 __le32 *value = (__le32 *)((char *)header +
 965                         le16_to_cpu(entry->e_value_offs));
 966                 for (n = (le32_to_cpu(entry->e_value_size) +
 967 Index: linux-stage/fs/ext4/xattr.h
 968 ===================================================================
 969 --- linux-stage.orig/fs/ext4/xattr.h
 970 +++ linux-stage/fs/ext4/xattr.h
 971 @@ -42,7 +42,7 @@ struct ext4_xattr_entry {
 972         __u8    e_name_len;     /* length of name */
 973         __u8    e_name_index;   /* attribute name index */
 974         __le16  e_value_offs;   /* offset in disk block of value */
 975 -       __le32  e_value_block;  /* disk block attribute is stored on (n/i) */
 976 +       __le32  e_value_inum;   /* inode in which the value is stored */
 977         __le32  e_value_size;   /* size of attribute value */
 978         __le32  e_hash;         /* hash value of name and value */
 979         char    e_name[0];      /* attribute name */
 980 @@ -67,6 +67,26 @@ struct ext4_xattr_entry {
 981                 EXT4_I(inode)->i_extra_isize))
 982  #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
 983
 984 +/*
 985 + * Link EA inode back to parent one using i_mtime field.
 986 + * Extra integer type conversion added to ignore higher
 987 + * bits in i_mtime.tv_sec which might be set by ext4_get()
 988 + */
 989 +#define EXT4_XATTR_INODE_SET_PARENT(inode, inum)       \
 990 +do {                                                   \
 991 +       (inode)->i_mtime.tv_sec = inum;                 \
 992 +} while(0)
 993 +
 994 +#define EXT4_XATTR_INODE_GET_PARENT(inode)             \
 995 +       ((__u32)(inode)->i_mtime.tv_sec)
 996 +
 997 +/*
 998 + * The minimum size of EA value when you start storing it in an external inode
 999 + * size of block - size of header - size of 1 entry - 4 null bytes
1000 +*/
1001 +#define EXT4_XATTR_MIN_LARGE_EA_SIZE(b)                                        \
1002 +       ((b) - EXT4_XATTR_LEN(3) - sizeof(struct ext4_xattr_header) - 4)
1003 +
1004  #define BHDR(bh) ((struct ext4_xattr_header *)((bh)->b_data))
1005  #define ENTRY(ptr) ((struct ext4_xattr_entry *)(ptr))
1006  #define BFIRST(bh) ENTRY(BHDR(bh)+1)
1007 @@ -75,10 +84,11 @@ struct ext4_xattr_entry {
1008  #define EXT4_ZERO_XATTR_VALUE ((void *)-1)
1009
1010  struct ext4_xattr_info {
1011 -       int name_index;
1012         const char *name;
1013         const void *value;
1014         size_t value_len;
1015 +       int name_index;
1016 +       int in_inode;
1017  };
1018
1019  struct ext4_xattr_search {
1020 @@ -106,7 +116,13 @@ extern int ext4_xattr_get(struct inode *
1021  extern int ext4_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
1022  extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
1023
1024 -extern void ext4_xattr_delete_inode(handle_t *, struct inode *);
1025 +extern struct inode *ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,
1026 +                                          int *err);
1027 +extern int ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino);
1028 +extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
1029 +                                  struct ext4_xattr_ino_array **array);
1030 +extern void ext4_xattr_inode_array_free(struct inode *inode,
1031 +                                       struct ext4_xattr_ino_array *array);
1032  extern void ext4_xattr_put_super(struct super_block *);
1033
1034  extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
1035 Index: linux-stage/fs/ext4/ialloc.c
1036 ===================================================================
1037 --- linux-stage.orig/fs/ext4/ialloc.c
1038 +++ linux-stage/fs/ext4/ialloc.c
1039 @@ -252,7 +252,6 @@ void ext4_free_inode(handle_t *handle, s
1040          * as writing the quota to disk may need the lock as well.
1041          */
1042         dquot_initialize(inode);
1043 -       ext4_xattr_delete_inode(handle, inode);
1044         dquot_free_inode(inode);
1045         dquot_drop(inode);
1046
1047 Index: linux-stage/fs/ext4/inline.c
1048 ===================================================================
1049 --- linux-stage.orig/fs/ext4/inline.c
1050 +++ linux-stage/fs/ext4/inline.c
1051 @@ -59,7 +59,7 @@ static int get_max_inline_xattr_value_si
1052
1053         /* Compute min_offs. */
1054         for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
1055 -               if (!entry->e_value_block && entry->e_value_size) {
1056 +               if (!entry->e_value_inum && entry->e_value_size) {
1057                         size_t offs = le16_to_cpu(entry->e_value_offs);
1058                         if (offs < min_offs)
1059                                 min_offs = offs;