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
7 Index: linux-3.12.39-47.1/fs/ext4/ext4.h
8 ===================================================================
9 --- linux-3.12.39-47.1.orig/fs/ext4/ext4.h
10 +++ linux-3.12.39-47.1/fs/ext4/ext4.h
11 @@ -1538,6 +1538,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 @@ -1938,6 +1939,12 @@ struct mmpd_data {
20 #define EXT4_MMP_MAX_CHECK_INTERVAL 300UL
23 + * Maximum size of xattr attributes for FEATURE_INCOMPAT_EA_INODE 1Mb
24 + * This limit is arbitrary, but is reasonable for the xattr API.
26 +#define EXT4_XATTR_MAX_LARGE_EA_SIZE (1024 * 1024)
32 @@ -1949,6 +1956,10 @@ struct mmpd_data {
33 # define ATTRIB_NORET __attribute__((noreturn))
34 # define NORET_AND noreturn,
36 +struct ext4_xattr_ino_array {
37 + unsigned int xia_count; /* # of used item in the array */
38 + unsigned int xia_inodes[0];
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 @@ -2162,6 +2173,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-3.12.39-47.1/fs/ext4/inode.c
52 ===================================================================
53 --- linux-3.12.39-47.1.orig/fs/ext4/inode.c
54 +++ linux-3.12.39-47.1/fs/ext4/inode.c
55 @@ -135,8 +135,6 @@ static void ext4_invalidatepage(struct p
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,
63 * Test whether an inode is a fast symlink.
64 @@ -182,6 +180,8 @@ void ext4_evict_inode(struct inode *inod
68 + int extra_credits = 3;
69 + struct ext4_xattr_ino_array *lea_ino_array = NULL;
71 trace_ext4_evict_inode(inode);
73 @@ -235,8 +235,8 @@ void ext4_evict_inode(struct inode *inod
74 * protection against it
76 sb_start_intwrite(inode->i_sb);
77 - handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE,
78 - ext4_blocks_for_truncate(inode)+3);
80 + handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, extra_credits);
82 ext4_std_error(inode->i_sb, PTR_ERR(handle));
84 @@ -248,9 +248,33 @@ void ext4_evict_inode(struct inode *inod
85 sb_end_intwrite(inode->i_sb);
90 ext4_handle_sync(handle);
93 + * Delete xattr inode before deleting the main inode.
95 + err = ext4_xattr_delete_inode(handle, inode, &lea_ino_array);
97 + ext4_warning(inode->i_sb,
98 + "couldn't delete inode's xattr (err %d)", err);
102 + if (!ext4_handle_has_enough_credits(handle,
103 + ext4_blocks_for_truncate(inode) + extra_credits)) {
104 + err = ext4_journal_extend(handle,
105 + ext4_blocks_for_truncate(inode) + extra_credits);
107 + err = ext4_journal_restart(handle,
108 + ext4_blocks_for_truncate(inode) + extra_credits);
110 + ext4_warning(inode->i_sb,
111 + "couldn't extend journal (err %d)", err);
117 err = ext4_mark_inode_dirty(handle, inode);
119 @@ -305,8 +329,12 @@ void ext4_evict_inode(struct inode *inod
120 ext4_clear_inode(inode);
122 ext4_free_inode(handle, inode);
124 ext4_journal_stop(handle);
125 sb_end_intwrite(inode->i_sb);
127 + if (lea_ino_array != NULL)
128 + ext4_xattr_inode_array_free(inode, lea_ino_array);
131 ext4_clear_inode(inode); /* We must guarantee clearing of inode... */
132 @@ -4754,7 +4782,7 @@ static int ext4_index_trans_blocks(struc
134 * Also account for superblock, inode, quota and xattr blocks
136 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
137 +int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
140 ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb);
141 Index: linux-3.12.39-47.1/fs/ext4/xattr.c
142 ===================================================================
143 --- linux-3.12.39-47.1.orig/fs/ext4/xattr.c
144 +++ linux-3.12.39-47.1/fs/ext4/xattr.c
145 @@ -233,19 +233,26 @@ ext4_xattr_check_block(struct inode *ino
149 -ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size)
150 +ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size,
151 + struct inode *inode)
153 size_t value_size = le32_to_cpu(entry->e_value_size);
155 - if (entry->e_value_block != 0 || value_size > size ||
156 - le16_to_cpu(entry->e_value_offs) + value_size > size)
157 + if ((entry->e_value_inum == 0) &&
158 + (le16_to_cpu(entry->e_value_offs) + value_size > size))
160 + if (entry->e_value_inum != 0 &&
161 + (le32_to_cpu(entry->e_value_inum) < EXT4_FIRST_INO(inode->i_sb) ||
162 + le32_to_cpu(entry->e_value_inum) >
163 + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_inodes_count)))
169 ext4_xattr_find_entry(struct ext4_xattr_entry **pentry, int name_index,
170 - const char *name, size_t size, int sorted)
171 + const char *name, size_t size, int sorted,
172 + struct inode *inode)
174 struct ext4_xattr_entry *entry;
176 @@ -265,11 +272,103 @@ ext4_xattr_find_entry(struct ext4_xattr_
180 - if (!cmp && ext4_xattr_check_entry(entry, size))
181 + if (!cmp && ext4_xattr_check_entry(entry, size, inode))
183 return cmp ? -ENODATA : 0;
187 + * Read the EA value from an inode.
190 +ext4_xattr_inode_read(struct inode *ea_inode, void *buf, size_t *size)
192 + unsigned long block = 0;
193 + struct buffer_head *bh = NULL;
194 + int err, blocksize;
195 + size_t csize, ret_size = 0;
200 + blocksize = ea_inode->i_sb->s_blocksize;
202 + while (ret_size < *size) {
203 + csize = (*size - ret_size) > blocksize ? blocksize :
205 + bh = ext4_bread(NULL, ea_inode, block, 0, &err);
210 + memcpy(buf, bh->b_data, csize);
223 +struct inode *ext4_xattr_inode_iget(struct inode *parent, int ea_ino, int *err)
225 + struct inode *ea_inode = NULL;
227 + ea_inode = ext4_iget(parent->i_sb, ea_ino);
228 + if (IS_ERR(ea_inode) || is_bad_inode(ea_inode)) {
229 + ext4_error(parent->i_sb, "error while reading EA inode %d",
235 + if (ea_inode->i_xattr_inode_parent != parent->i_ino ||
236 + ea_inode->i_generation != parent->i_generation) {
237 + ext4_error(parent->i_sb, "Backpointer from EA inode %d "
238 + "to parent invalid.", ea_ino);
243 + if (!(EXT4_I(ea_inode)->i_flags & EXT4_EA_INODE_FL)) {
244 + ext4_error(parent->i_sb, "EA inode %d does not have "
245 + "EXT4_EA_INODE_FL flag set.\n", ea_ino);
259 + * Read the value from the EA inode.
262 +ext4_xattr_inode_get(struct inode *inode, int ea_ino, void *buffer,
265 + struct inode *ea_inode = NULL;
268 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
272 + err = ext4_xattr_inode_read(ea_inode, buffer, size);
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:
283 ext4_xattr_cache_insert(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,
291 @@ -311,8 +411,16 @@ bad_block:
293 if (size > buffer_size)
295 - memcpy(buffer, bh->b_data + le16_to_cpu(entry->e_value_offs),
297 + if (entry->e_value_inum != 0) {
298 + error = ext4_xattr_inode_get(inode,
299 + le32_to_cpu(entry->e_value_inum),
304 + memcpy(buffer, bh->b_data +
305 + le16_to_cpu(entry->e_value_offs), size);
310 @@ -346,7 +454,7 @@ ext4_xattr_ibody_get(struct inode *inode
313 error = ext4_xattr_find_entry(&entry, name_index, name,
314 - end - (void *)entry, 0);
315 + end - (void *)entry, 0, inode);
318 size = le32_to_cpu(entry->e_value_size);
319 @@ -354,8 +462,16 @@ ext4_xattr_ibody_get(struct inode *inode
321 if (size > buffer_size)
323 - memcpy(buffer, (void *)IFIRST(header) +
324 - le16_to_cpu(entry->e_value_offs), size);
325 + if (entry->e_value_inum != 0) {
326 + error = ext4_xattr_inode_get(inode,
327 + le32_to_cpu(entry->e_value_inum),
332 + memcpy(buffer, (void *)IFIRST(header) +
333 + le16_to_cpu(entry->e_value_offs), size);
338 @@ -597,7 +713,7 @@ static size_t ext4_xattr_free_space(stru
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 == 0 && last->e_value_size > 0) {
344 size_t offs = le16_to_cpu(last->e_value_offs);
345 if (offs < *min_offs)
347 @@ -606,16 +722,172 @@ static size_t ext4_xattr_free_space(stru
348 return (*min_offs - ((void *)last - base) - sizeof(__u32));
352 + * Write the value of the EA in an inode.
355 +ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode,
356 + const void *buf, int bufsize)
358 + struct buffer_head *bh = NULL;
359 + unsigned long block = 0;
360 + unsigned blocksize = ea_inode->i_sb->s_blocksize;
361 + unsigned max_blocks = (bufsize + blocksize - 1) >> ea_inode->i_blkbits;
362 + int csize, wsize = 0;
367 + while (ret >= 0 && ret < max_blocks) {
368 + struct ext4_map_blocks map;
369 + map.m_lblk = block += ret;
370 + map.m_len = max_blocks -= ret;
372 + ret = ext4_map_blocks(handle, ea_inode, &map,
373 + EXT4_GET_BLOCKS_CREATE);
375 + ext4_mark_inode_dirty(handle, ea_inode);
376 + if (ret == -ENOSPC &&
377 + ext4_should_retry_alloc(ea_inode->i_sb, &retries)) {
389 + while (wsize < bufsize) {
392 + csize = (bufsize - wsize) > blocksize ? blocksize :
394 + bh = ext4_getblk(handle, ea_inode, block, 0, &ret);
397 + ret = ext4_journal_get_write_access(handle, bh);
401 + memcpy(bh->b_data, buf, csize);
402 + set_buffer_uptodate(bh);
403 + ext4_handle_dirty_metadata(handle, ea_inode, bh);
410 + i_size_write(ea_inode, wsize);
411 + ext4_update_i_disksize(ea_inode, wsize);
413 + ext4_mark_inode_dirty(handle, ea_inode);
422 + * Create an inode to store the value of a large EA.
424 +static struct inode *
425 +ext4_xattr_inode_create(handle_t *handle, struct inode *inode)
427 + struct inode *ea_inode = NULL;
430 + * Let the next inode be the goal, so we try and allocate the EA inode
431 + * in the same group, or nearby one.
433 + ea_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode,
434 + S_IFREG|0600, NULL, inode->i_ino + 1, NULL);
436 + if (!IS_ERR(ea_inode)) {
437 + ea_inode->i_op = &ext4_file_inode_operations;
438 + ea_inode->i_fop = &ext4_file_operations;
439 + ext4_set_aops(ea_inode);
440 + ea_inode->i_generation = inode->i_generation;
441 + EXT4_I(ea_inode)->i_flags |= EXT4_EA_INODE_FL;
444 + * A back-pointer from EA inode to parent inode will be useful
447 + ea_inode->i_xattr_inode_parent = inode->i_ino;
448 + unlock_new_inode(ea_inode);
455 + * Unlink the inode storing the value of the EA.
458 +ext4_xattr_inode_unlink(struct inode *inode, int ea_ino)
460 + struct inode *ea_inode = NULL;
463 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
467 + clear_nlink(ea_inode);
474 + * Add value of the EA in an inode.
477 -ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s)
478 +ext4_xattr_inode_set(handle_t *handle, struct inode *inode, int *ea_ino,
479 + const void *value, size_t value_len)
481 + struct inode *ea_inode = NULL;
484 + /* Create an inode for the EA value */
485 + ea_inode = ext4_xattr_inode_create(handle, inode);
486 + if (IS_ERR(ea_inode))
489 + err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);
491 + clear_nlink(ea_inode);
493 + *ea_ino = ea_inode->i_ino;
501 +ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s,
502 + handle_t *handle, struct inode *inode)
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;
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)))
514 /* Compute min_offs and last. */
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 == 0 && last->e_value_size > 0) {
519 size_t offs = le16_to_cpu(last->e_value_offs);
522 @@ -623,16 +895,21 @@ ext4_xattr_set_entry(struct ext4_xattr_i
524 free = min_offs - ((void *)last - s->base) - sizeof(__u32);
526 - if (!s->here->e_value_block && s->here->e_value_size) {
527 + if (!in_inode && s->here->e_value_inum == 0 &&
528 + s->here->e_value_size > 0) {
529 size_t size = le32_to_cpu(s->here->e_value_size);
530 free += EXT4_XATTR_SIZE(size);
532 free += EXT4_XATTR_LEN(name_len);
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);
543 + if (free < value_len ||
544 + free < EXT4_XATTR_LEN(name_len) + value_len)
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);
552 - if (!s->here->e_value_block && s->here->e_value_size) {
553 + if (s->here->e_value_offs > 0 && s->here->e_value_inum == 0 &&
554 + s->here->e_value_size > 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,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
560 while (!IS_LAST_ENTRY(last)) {
561 size_t o = le16_to_cpu(last->e_value_offs);
562 - if (!last->e_value_block &&
563 - last->e_value_size && o < offs)
564 + if (last->e_value_size > 0 && o < offs)
566 cpu_to_le16(o + size);
567 last = EXT4_XATTR_NEXT(last);
570 + if (s->here->e_value_inum != 0) {
571 + ext4_xattr_inode_unlink(inode,
572 + le32_to_cpu(s->here->e_value_inum));
573 + s->here->e_value_inum = 0;
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
580 /* Insert the new value. */
581 s->here->e_value_size = cpu_to_le32(i->value_len);
582 - if (i->value_len) {
584 + int ea_ino = le32_to_cpu(s->here->e_value_inum);
585 + ext4_xattr_inode_set(handle, inode, &ea_ino, i->value,
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);
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)
605 bs->s.not_found = error;
606 @@ -777,8 +1066,6 @@ ext4_xattr_block_set(handle_t *handle, s
608 #define header(x) ((struct ext4_xattr_header *)(x))
610 - if (i->value && i->value_len > sb->s_blocksize)
613 ce = mb_cache_entry_get(ext4_xattr_cache, bs->bh->b_bdev,
615 @@ -794,7 +1081,7 @@ ext4_xattr_block_set(handle_t *handle, s
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);
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;
628 - error = ext4_xattr_set_entry(i, s);
629 + error = ext4_xattr_set_entry(i, s, handle, inode);
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,
637 - (void *)is->s.base, 0);
638 + (void *)is->s.base, 0, inode);
639 if (error && error != -ENODATA)
641 is->s.not_found = error;
642 @@ -1012,7 +1299,7 @@ int ext4_xattr_ibody_inline_set(handle_t
644 if (EXT4_I(inode)->i_extra_isize == 0)
646 - error = ext4_xattr_set_entry(i, s);
647 + error = ext4_xattr_set_entry(i, s, handle, inode);
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);
655 - error = ext4_xattr_set_entry(i, s);
656 + error = ext4_xattr_set_entry(i, s, handle, inode);
660 @@ -1050,7 +1337,7 @@ static int ext4_xattr_ibody_set(handle_t
662 if (EXT4_I(inode)->i_extra_isize == 0)
664 - error = ext4_xattr_set_entry(i, s);
665 + error = ext4_xattr_set_entry(i, s, handle, inode);
668 header = IHDR(inode, ext4_raw_inode(&is->iloc));
669 @@ -1086,7 +1373,7 @@ ext4_xattr_set_handle(handle_t *handle,
672 .value_len = value_len,
676 struct ext4_xattr_ibody_find is = {
677 .s = { .not_found = -ENODATA, },
678 @@ -1151,6 +1438,15 @@ ext4_xattr_set_handle(handle_t *handle,
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
688 + error = ext4_xattr_ibody_set(handle, inode,
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)
698 + struct super_block *sb = inode->i_sb;
699 int error, retries = 0;
700 int credits = ext4_jbd2_credits_xattr(inode);
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;
707 + /* For new inode */
708 + credits += EXT4_SINGLEDATA_TRANS_BLOCKS(sb) + 3;
710 + /* For data blocks of EA inode */
711 + credits += ext4_meta_trans_blocks(inode, nrblocks, 0);
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))
726 @@ -1233,7 +1542,7 @@ static void ext4_xattr_shift_entries(str
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 == 0 && last->e_value_size > 0) {
732 new_offs = le16_to_cpu(last->e_value_offs) +
734 BUG_ON(new_offs + le32_to_cpu(last->e_value_size)
735 @@ -1472,19 +1781,91 @@ cleanup:
740 +#define EIA_INCR 16 /* must be 2^n */
741 +#define EIA_MASK (EIA_INCR - 1)
742 +/* Add the large xattr @ino into @lea_ino_array for later deletion.
743 + * If @lea_ino_array is new or full it will be grown and the old
744 + * contents copied over.
747 +ext4_expand_ino_array(struct ext4_xattr_ino_array **lea_ino_array, __u32 ino)
749 + if (*lea_ino_array == NULL) {
751 + * Start with 15 inodes, so it fits into a power-of-two size.
752 + * If *lea_ino_array is NULL, this is essentially offsetof()
755 + kmalloc(offsetof(struct ext4_xattr_ino_array,
756 + xia_inodes[EIA_MASK]),
758 + if (*lea_ino_array == NULL)
760 + (*lea_ino_array)->xia_count = 0;
761 + } else if (((*lea_ino_array)->xia_count & EIA_MASK) == EIA_MASK) {
762 + /* expand the array once all 15 + n * 16 slots are full */
763 + struct ext4_xattr_ino_array *new_array = NULL;
764 + int count = (*lea_ino_array)->xia_count;
766 + /* if new_array is NULL, this is essentially offsetof() */
767 + new_array = kmalloc(
768 + offsetof(struct ext4_xattr_ino_array,
769 + xia_inodes[count + EIA_INCR]),
771 + if (new_array == NULL)
773 + memcpy(new_array, *lea_ino_array,
774 + offsetof(struct ext4_xattr_ino_array,
775 + xia_inodes[count]));
776 + kfree(*lea_ino_array);
777 + *lea_ino_array = new_array;
779 + (*lea_ino_array)->xia_inodes[(*lea_ino_array)->xia_count++] = ino;
783 * ext4_xattr_delete_inode()
785 - * Free extended attribute resources associated with this inode. This
786 + * Free extended attribute resources associated with this inode. Traverse
787 + * all entries and unlink any xattr inodes associated with this inode. This
788 * is called immediately before an inode is freed. We have exclusive
789 - * access to the inode.
790 + * access to the inode. If an orphan inode is deleted it will also delete any
791 + * xattr block and all xattr inodes. They are checked by ext4_xattr_inode_iget()
792 + * to ensure they belong to the parent inode and were not deleted already.
795 -ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
797 +ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
798 + struct ext4_xattr_ino_array **lea_ino_array)
800 struct buffer_head *bh = NULL;
801 + struct ext4_xattr_ibody_header *header;
802 + struct ext4_inode *raw_inode;
803 + struct ext4_iloc iloc;
804 + struct ext4_xattr_entry *entry;
807 + if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR))
808 + goto delete_external_ea;
810 + error = ext4_get_inode_loc(inode, &iloc);
813 + raw_inode = ext4_raw_inode(&iloc);
814 + header = IHDR(inode, raw_inode);
815 + entry = IFIRST(header);
816 + for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
817 + if (entry->e_value_inum == 0)
819 + if (ext4_expand_ino_array(lea_ino_array,
820 + entry->e_value_inum) != 0) {
824 + entry->e_value_inum = 0;
829 if (!EXT4_I(inode)->i_file_acl)
831 bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
832 @@ -1499,11 +1880,74 @@ ext4_xattr_delete_inode(handle_t *handle
833 EXT4_I(inode)->i_file_acl);
837 + entry = BFIRST(bh);
838 + for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
839 + if (entry->e_value_inum == 0)
841 + if (ext4_expand_ino_array(lea_ino_array,
842 + entry->e_value_inum) != 0)
844 + entry->e_value_inum = 0;
847 + /* add xattr inode to orphan list */
848 + if (*lea_ino_array != NULL) {
849 + struct inode *ea_inode = NULL;
852 + for (; idx < (*lea_ino_array)->xia_count; ++idx) {
853 + if (!ext4_handle_has_enough_credits(handle, 3)) {
854 + error = ext4_journal_extend(handle, 3);
856 + error = ext4_journal_restart(handle, 3);
858 + ext4_warning(inode->i_sb,
859 + "couldn't extend journal "
860 + "(err %d)", error);
864 + ea_inode = ext4_xattr_inode_iget(inode,
865 + (*lea_ino_array)->xia_inodes[idx], &error);
868 + ext4_orphan_add(handle, ea_inode);
869 + /* the inode's i_count will be released by caller */
873 ext4_xattr_release_block(handle, inode, bh);
874 EXT4_I(inode)->i_file_acl = 0;
883 +ext4_xattr_inode_array_free(struct inode *inode,
884 + struct ext4_xattr_ino_array *lea_ino_array)
886 + struct inode *ea_inode = NULL;
890 + if (lea_ino_array == NULL)
893 + for (; idx < lea_ino_array->xia_count; ++idx) {
894 + ea_inode = ext4_xattr_inode_iget(inode,
895 + lea_ino_array->xia_inodes[idx], &err);
898 + clear_nlink(ea_inode);
900 + /* for inode's i_count get from ext4_xattr_delete_inode */
903 + kfree(lea_ino_array);
907 @@ -1573,10 +2017,9 @@ ext4_xattr_cmp(struct ext4_xattr_header
908 entry1->e_name_index != entry2->e_name_index ||
909 entry1->e_name_len != entry2->e_name_len ||
910 entry1->e_value_size != entry2->e_value_size ||
911 + entry1->e_value_inum != entry2->e_value_inum ||
912 memcmp(entry1->e_name, entry2->e_name, entry1->e_name_len))
914 - if (entry1->e_value_block != 0 || entry2->e_value_block != 0)
916 if (memcmp((char *)header1 + le16_to_cpu(entry1->e_value_offs),
917 (char *)header2 + le16_to_cpu(entry2->e_value_offs),
918 le32_to_cpu(entry1->e_value_size)))
919 @@ -1660,7 +2103,7 @@ static inline void ext4_xattr_hash_entry
923 - if (entry->e_value_block == 0 && entry->e_value_size != 0) {
924 + if (entry->e_value_inum == 0 && entry->e_value_size != 0) {
925 __le32 *value = (__le32 *)((char *)header +
926 le16_to_cpu(entry->e_value_offs));
927 for (n = (le32_to_cpu(entry->e_value_size) +
928 Index: linux-3.12.39-47.1/fs/ext4/xattr.h
929 ===================================================================
930 --- linux-3.12.39-47.1.orig/fs/ext4/xattr.h
931 +++ linux-3.12.39-47.1/fs/ext4/xattr.h
932 @@ -42,7 +42,7 @@ struct ext4_xattr_entry {
933 __u8 e_name_len; /* length of name */
934 __u8 e_name_index; /* attribute name index */
935 __le16 e_value_offs; /* offset in disk block of value */
936 - __le32 e_value_block; /* disk block attribute is stored on (n/i) */
937 + __le32 e_value_inum; /* inode in which the value is stored */
938 __le32 e_value_size; /* size of attribute value */
939 __le32 e_hash; /* hash value of name and value */
940 char e_name[0]; /* attribute name */
941 @@ -67,6 +67,15 @@ struct ext4_xattr_entry {
942 EXT4_I(inode)->i_extra_isize))
943 #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
945 +#define i_xattr_inode_parent i_mtime.tv_sec
948 + * The minimum size of EA value when you start storing it in an external inode
949 + * size of block - size of header - size of 1 entry - 4 null bytes
951 +#define EXT4_XATTR_MIN_LARGE_EA_SIZE(b) \
952 + ((b) - EXT4_XATTR_LEN(3) - sizeof(struct ext4_xattr_header) - 4)
954 #define BHDR(bh) ((struct ext4_xattr_header *)((bh)->b_data))
955 #define ENTRY(ptr) ((struct ext4_xattr_entry *)(ptr))
956 #define BFIRST(bh) ENTRY(BHDR(bh)+1)
957 @@ -75,10 +84,11 @@ struct ext4_xattr_entry {
958 #define EXT4_ZERO_XATTR_VALUE ((void *)-1)
960 struct ext4_xattr_info {
969 struct ext4_xattr_search {
970 @@ -106,7 +116,13 @@ extern int ext4_xattr_get(struct inode *
971 extern int ext4_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
972 extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
974 -extern void ext4_xattr_delete_inode(handle_t *, struct inode *);
975 +extern struct inode *ext4_xattr_inode_iget(struct inode *parent, int ea_ino,
977 +extern int ext4_xattr_inode_unlink(struct inode *inode, int ea_ino);
978 +extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
979 + struct ext4_xattr_ino_array **array);
980 +extern void ext4_xattr_inode_array_free(struct inode *inode,
981 + struct ext4_xattr_ino_array *array);
982 extern void ext4_xattr_put_super(struct super_block *);
984 extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
985 Index: linux-3.12.39-47.1/fs/ext4/ialloc.c
986 ===================================================================
987 --- linux-3.12.39-47.1.orig/fs/ext4/ialloc.c
988 +++ linux-3.12.39-47.1/fs/ext4/ialloc.c
989 @@ -252,7 +252,6 @@ void ext4_free_inode(handle_t *handle, s
990 * as writing the quota to disk may need the lock as well.
992 dquot_initialize(inode);
993 - ext4_xattr_delete_inode(handle, inode);
994 dquot_free_inode(inode);
997 Index: linux-3.12.39-47.1/fs/ext4/inline.c
998 ===================================================================
999 --- linux-3.12.39-47.1.orig/fs/ext4/inline.c
1000 +++ linux-3.12.39-47.1/fs/ext4/inline.c
1001 @@ -59,7 +59,7 @@ static int get_max_inline_xattr_value_si
1003 /* Compute min_offs. */
1004 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
1005 - if (!entry->e_value_block && entry->e_value_size) {
1006 + if (!entry->e_value_inum && entry->e_value_size) {
1007 size_t offs = le16_to_cpu(entry->e_value_offs);
1008 if (offs < min_offs)