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-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 @@ -1956,6 +1963,10 @@ struct mmpd_data {
20 # define ATTRIB_NORET __attribute__((noreturn))
21 # define NORET_AND noreturn,
23 +struct ext4_xattr_ino_array {
24 + unsigned int xia_count; /* # of used item in the array */
25 + unsigned int xia_inodes[0];
28 extern unsigned int ext4_count_free(char *bitmap, unsigned numchars);
29 void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
30 @@ -2169,6 +2180,7 @@ extern void ext4_set_inode_flags(struct
31 extern void ext4_get_inode_flags(struct ext4_inode_info *);
32 extern int ext4_alloc_da_blocks(struct inode *inode);
33 extern void ext4_set_aops(struct inode *inode);
34 +extern int ext4_meta_trans_blocks(struct inode *, int nrblocks, int chunk);
35 extern int ext4_writepage_trans_blocks(struct inode *);
36 extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
37 extern int ext4_block_truncate_page(handle_t *handle,
38 Index: linux-stage/fs/ext4/inode.c
39 ===================================================================
40 --- linux-stage.orig/fs/ext4/inode.c
41 +++ linux-stage/fs/ext4/inode.c
42 @@ -135,8 +135,6 @@ static void ext4_invalidatepage(struct p
44 static int __ext4_journalled_writepage(struct page *page, unsigned int len);
45 static int ext4_bh_delay_or_unwritten(handle_t *handle, struct buffer_head *bh);
46 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
50 * Test whether an inode is a fast symlink.
51 @@ -182,6 +180,8 @@ void ext4_evict_inode(struct inode *inod
55 + int extra_credits = 3;
56 + struct ext4_xattr_ino_array *lea_ino_array = NULL;
58 trace_ext4_evict_inode(inode);
60 @@ -235,8 +235,8 @@ void ext4_evict_inode(struct inode *inod
61 * protection against it
63 sb_start_intwrite(inode->i_sb);
64 - handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE,
65 - ext4_blocks_for_truncate(inode)+3);
67 + handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, extra_credits);
69 ext4_std_error(inode->i_sb, PTR_ERR(handle));
71 @@ -251,6 +251,32 @@ void ext4_evict_inode(struct inode *inod
74 ext4_handle_sync(handle);
76 + /* Delete xattr inode before deleting the main inode. */
77 + err = ext4_xattr_delete_inode(handle, inode, &lea_ino_array);
79 + ext4_warning(inode->i_sb,
80 + "couldn't delete inode's xattr (err %d)", err);
84 + if (!IS_NOQUOTA(inode))
85 + extra_credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
87 + if (!ext4_handle_has_enough_credits(handle,
88 + ext4_blocks_for_truncate(inode) + extra_credits)) {
89 + err = ext4_journal_extend(handle,
90 + ext4_blocks_for_truncate(inode) + extra_credits);
92 + err = ext4_journal_restart(handle,
93 + ext4_blocks_for_truncate(inode) + extra_credits);
95 + ext4_warning(inode->i_sb,
96 + "couldn't extend journal (err %d)", err);
102 err = ext4_mark_inode_dirty(handle, inode);
104 @@ -269,10 +296,10 @@ void ext4_evict_inode(struct inode *inod
105 * enough credits left in the handle to remove the inode from
106 * the orphan list and set the dtime field.
108 - if (!ext4_handle_has_enough_credits(handle, 3)) {
109 - err = ext4_journal_extend(handle, 3);
110 + if (!ext4_handle_has_enough_credits(handle, extra_credits)) {
111 + err = ext4_journal_extend(handle, extra_credits);
113 - err = ext4_journal_restart(handle, 3);
114 + err = ext4_journal_restart(handle, extra_credits);
116 ext4_warning(inode->i_sb,
117 "couldn't extend journal (err %d)", err);
118 @@ -307,6 +334,9 @@ void ext4_evict_inode(struct inode *inod
119 ext4_free_inode(handle, inode);
120 ext4_journal_stop(handle);
121 sb_end_intwrite(inode->i_sb);
123 + if (lea_ino_array != NULL)
124 + ext4_xattr_inode_array_free(inode, lea_ino_array);
127 ext4_clear_inode(inode); /* We must guarantee clearing of inode... */
128 @@ -4777,7 +4807,7 @@ static int ext4_index_trans_blocks(struc
130 * Also account for superblock, inode, quota and xattr blocks
132 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
133 +int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
136 ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb);
137 Index: linux-stage/fs/ext4/xattr.c
138 ===================================================================
139 --- linux-stage.orig/fs/ext4/xattr.c
140 +++ linux-stage/fs/ext4/xattr.c
141 @@ -201,6 +201,7 @@ ext4_xattr_check_names(struct ext4_xattr
143 while (!IS_LAST_ENTRY(entry)) {
144 if (entry->e_value_size != 0 &&
145 + entry->e_value_inum == 0 &&
146 (value_start + le16_to_cpu(entry->e_value_offs) <
147 (void *)e + sizeof(__u32) ||
148 value_start + le16_to_cpu(entry->e_value_offs) +
149 @@ -233,19 +233,26 @@ ext4_xattr_check_block(struct inode *ino
153 -ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size)
154 +ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size,
155 + struct inode *inode)
157 size_t value_size = le32_to_cpu(entry->e_value_size);
159 - if (entry->e_value_block != 0 || value_size > size ||
160 + if (!entry->e_value_inum &&
161 le16_to_cpu(entry->e_value_offs) + value_size > size)
163 + if (entry->e_value_inum &&
164 + (le32_to_cpu(entry->e_value_inum) < EXT4_FIRST_INO(inode->i_sb) ||
165 + le32_to_cpu(entry->e_value_inum) >
166 + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_inodes_count)))
172 ext4_xattr_find_entry(struct ext4_xattr_entry **pentry, int name_index,
173 - const char *name, size_t size, int sorted)
174 + const char *name, size_t size, int sorted,
175 + struct inode *inode)
177 struct ext4_xattr_entry *entry;
179 @@ -265,11 +272,109 @@ ext4_xattr_find_entry(struct ext4_xattr_
183 - if (!cmp && ext4_xattr_check_entry(entry, size))
184 + if (!cmp && ext4_xattr_check_entry(entry, size, inode))
186 return cmp ? -ENODATA : 0;
190 + * Read the EA value from an inode.
192 +static int ext4_xattr_inode_read(struct inode *ea_inode, void *buf, size_t *size)
194 + unsigned long block = 0;
195 + struct buffer_head *bh = NULL;
196 + int err, blocksize;
197 + size_t csize, ret_size = 0;
202 + blocksize = ea_inode->i_sb->s_blocksize;
204 + while (ret_size < *size) {
205 + csize = (*size - ret_size) > blocksize ? blocksize :
207 + bh = ext4_bread(NULL, ea_inode, block, 0, &err);
212 + memcpy(buf, bh->b_data, csize);
226 + * Fetch the xattr inode from disk.
228 + * The xattr inode stores the parent inode number and generation so that
229 + * the kernel and e2fsck can verify the xattr inode is valid upon access.
231 +struct inode *ext4_xattr_inode_iget(struct inode *parent,
232 + unsigned long ea_ino, int *err)
234 + struct inode *ea_inode = NULL;
236 + ea_inode = ext4_iget(parent->i_sb, ea_ino);
237 + if (IS_ERR(ea_inode) || is_bad_inode(ea_inode)) {
238 + int rc = IS_ERR(ea_inode) ? PTR_ERR(ea_inode) : 0;
239 + ext4_error(parent->i_sb, "error while reading EA inode %lu "
240 + "/ %d %d", ea_ino, rc, is_bad_inode(ea_inode));
241 + *err = rc != 0 ? rc : -EIO;
245 + if (EXT4_XATTR_INODE_GET_PARENT(ea_inode) != parent->i_ino ||
246 + ea_inode->i_generation != parent->i_generation) {
247 + ext4_error(parent->i_sb, "Backpointer from EA inode %lu "
248 + "to parent invalid.", ea_ino);
253 + if (!(EXT4_I(ea_inode)->i_flags & EXT4_EA_INODE_FL)) {
254 + ext4_error(parent->i_sb, "EA inode %lu does not have "
255 + "EXT4_EA_INODE_FL flag set.\n", ea_ino);
269 + * Read the value from the EA inode.
271 +static int ext4_xattr_inode_get(struct inode *inode, unsigned long ea_ino,
272 + void *buffer, size_t *size)
274 + struct inode *ea_inode = NULL;
277 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
281 + err = ext4_xattr_inode_read(ea_inode, buffer, size);
288 ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,
289 void *buffer, size_t buffer_size)
290 @@ -301,7 +400,8 @@ bad_block:
292 ext4_xattr_cache_insert(bh);
294 - error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1);
295 + error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1,
300 @@ -311,8 +411,16 @@ bad_block:
302 if (size > buffer_size)
304 - memcpy(buffer, bh->b_data + le16_to_cpu(entry->e_value_offs),
306 + if (entry->e_value_inum) {
307 + error = ext4_xattr_inode_get(inode,
308 + le32_to_cpu(entry->e_value_inum),
313 + memcpy(buffer, bh->b_data +
314 + le16_to_cpu(entry->e_value_offs), size);
319 @@ -346,7 +454,7 @@ ext4_xattr_ibody_get(struct inode *inode
322 error = ext4_xattr_find_entry(&entry, name_index, name,
323 - end - (void *)entry, 0);
324 + end - (void *)entry, 0, inode);
327 size = le32_to_cpu(entry->e_value_size);
328 @@ -354,8 +462,16 @@ ext4_xattr_ibody_get(struct inode *inode
330 if (size > buffer_size)
332 - memcpy(buffer, (void *)IFIRST(header) +
333 - le16_to_cpu(entry->e_value_offs), size);
334 + if (entry->e_value_inum) {
335 + error = ext4_xattr_inode_get(inode,
336 + le32_to_cpu(entry->e_value_inum),
341 + memcpy(buffer, (void *)IFIRST(header) +
342 + le16_to_cpu(entry->e_value_offs), size);
347 @@ -597,7 +713,7 @@ static size_t ext4_xattr_free_space(stru
349 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
350 *total += EXT4_XATTR_LEN(last->e_name_len);
351 - if (!last->e_value_block && last->e_value_size) {
352 + if (!last->e_value_inum && last->e_value_size) {
353 size_t offs = le16_to_cpu(last->e_value_offs);
354 if (offs < *min_offs)
356 @@ -606,16 +722,196 @@ static size_t ext4_xattr_free_space(stru
357 return (*min_offs - ((void *)last - base) - sizeof(__u32));
361 + * Write the value of the EA in an inode.
364 -ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s)
365 +ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode,
366 + const void *buf, int bufsize)
368 + struct buffer_head *bh = NULL;
369 + unsigned long block = 0;
370 + unsigned blocksize = ea_inode->i_sb->s_blocksize;
371 + unsigned max_blocks = (bufsize + blocksize - 1) >> ea_inode->i_blkbits;
372 + int csize, wsize = 0;
377 + while (ret >= 0 && ret < max_blocks) {
378 + struct ext4_map_blocks map;
379 + map.m_lblk = block += ret;
380 + map.m_len = max_blocks -= ret;
382 + ret = ext4_map_blocks(handle, ea_inode, &map,
383 + EXT4_GET_BLOCKS_CREATE);
385 + ext4_mark_inode_dirty(handle, ea_inode);
386 + if (ret == -ENOSPC &&
387 + ext4_should_retry_alloc(ea_inode->i_sb, &retries)) {
399 + while (wsize < bufsize) {
402 + csize = (bufsize - wsize) > blocksize ? blocksize :
404 + bh = ext4_getblk(handle, ea_inode, block, 0, &ret);
407 + ret = ext4_journal_get_write_access(handle, bh);
411 + memcpy(bh->b_data, buf, csize);
412 + set_buffer_uptodate(bh);
413 + ext4_handle_dirty_metadata(handle, ea_inode, bh);
420 + i_size_write(ea_inode, wsize);
421 + ext4_update_i_disksize(ea_inode, wsize);
423 + ext4_mark_inode_dirty(handle, ea_inode);
431 +static void ext4_xattr_inode_set_ref(struct inode *ea_inode, __u64 ref_count)
433 + ea_inode->i_ctime.tv_sec = (__u32)(ref_count >> 32);
434 + ea_inode->i_version = (__u32)ref_count;
437 +static void ext4_xattr_inode_set_hash(struct inode *ea_inode, __u32 hash)
439 + ea_inode->i_atime.tv_sec = hash;
443 + * Create an inode to store the value of a large EA.
445 +static struct inode *
446 +ext4_xattr_inode_create(handle_t *handle, struct inode *inode, __u32 hash)
448 + struct inode *ea_inode = NULL;
451 + * Let the next inode be the goal, so we try and allocate the EA inode
452 + * in the same group, or nearby one.
454 + ea_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode,
455 + S_IFREG|0600, NULL, inode->i_ino + 1, NULL);
457 + if (!IS_ERR(ea_inode)) {
458 + ea_inode->i_op = &ext4_file_inode_operations;
459 + ea_inode->i_fop = &ext4_file_operations;
460 + ext4_set_aops(ea_inode);
461 + ea_inode->i_generation = inode->i_generation;
462 + EXT4_I(ea_inode)->i_flags |= EXT4_EA_INODE_FL;
465 + * A back-pointer from EA inode to parent inode will be useful
468 + EXT4_XATTR_INODE_SET_PARENT(ea_inode, inode->i_ino);
469 + unlock_new_inode(ea_inode);
471 + ext4_xattr_inode_set_ref(ea_inode, 1);
472 + ext4_xattr_inode_set_hash(ea_inode, hash);
479 + * Unlink the inode storing the value of the EA.
482 +ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino)
484 + struct inode *ea_inode = NULL;
487 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
491 + clear_nlink(ea_inode);
498 +ext4_xattr_inode_hash(struct ext4_sb_info *sbi, const void *buffer, size_t size)
500 + if (ext4_has_metadata_csum(sbi->s_sb))
501 + return ext4_chksum(sbi, sbi->s_csum_seed, buffer, size);
506 + * Add value of the EA in an inode.
509 +ext4_xattr_inode_set(handle_t *handle, struct inode *inode, unsigned long *ea_ino,
510 + const void *value, size_t value_len)
512 + struct inode *ea_inode = NULL;
516 + /* Create an inode for the EA value */
517 + hash = ext4_xattr_inode_hash(EXT4_SB(inode->i_sb), value, value_len);
518 + ea_inode = ext4_xattr_inode_create(handle, inode, hash);
519 + if (IS_ERR(ea_inode))
522 + err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);
524 + clear_nlink(ea_inode);
526 + *ea_ino = ea_inode->i_ino;
534 +ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s,
535 + handle_t *handle, struct inode *inode)
537 struct ext4_xattr_entry *last;
538 size_t free, min_offs = s->end - s->base, name_len = strlen(i->name);
539 + int in_inode = i->in_inode;
541 + if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
542 + EXT4_FEATURE_INCOMPAT_EA_INODE) &&
543 + (EXT4_XATTR_SIZE(i->value_len) >
544 + EXT4_XATTR_MIN_LARGE_EA_SIZE(inode->i_sb->s_blocksize)))
547 /* Compute min_offs and last. */
549 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
550 - if (!last->e_value_block && last->e_value_size) {
551 + if (!last->e_value_inum && last->e_value_size) {
552 size_t offs = le16_to_cpu(last->e_value_offs);
555 @@ -623,16 +919,21 @@ ext4_xattr_set_entry(struct ext4_xattr_i
557 free = min_offs - ((void *)last - s->base) - sizeof(__u32);
559 - if (!s->here->e_value_block && s->here->e_value_size) {
561 + !s->here->e_value_inum && s->here->e_value_size) {
562 size_t size = le32_to_cpu(s->here->e_value_size);
563 free += EXT4_XATTR_SIZE(size);
565 free += EXT4_XATTR_LEN(name_len);
568 - if (free < EXT4_XATTR_SIZE(i->value_len) ||
569 - free < EXT4_XATTR_LEN(name_len) +
570 - EXT4_XATTR_SIZE(i->value_len))
571 + size_t value_len = EXT4_XATTR_SIZE(i->value_len);
576 + if (free < value_len ||
577 + free < EXT4_XATTR_LEN(name_len) + value_len)
581 @@ -646,7 +947,8 @@ ext4_xattr_set_entry(struct ext4_xattr_i
582 s->here->e_name_len = name_len;
583 memcpy(s->here->e_name, i->name, name_len);
585 - if (!s->here->e_value_block && s->here->e_value_size) {
586 + if (!s->here->e_value_inum && s->here->e_value_size &&
587 + s->here->e_value_offs > 0) {
588 void *first_val = s->base + min_offs;
589 size_t offs = le16_to_cpu(s->here->e_value_offs);
590 void *val = s->base + offs;
591 @@ -680,13 +982,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
593 while (!IS_LAST_ENTRY(last)) {
594 size_t o = le16_to_cpu(last->e_value_offs);
595 - if (!last->e_value_block &&
596 + if (!last->e_value_inum &&
597 last->e_value_size && o < offs)
599 cpu_to_le16(o + size);
600 last = EXT4_XATTR_NEXT(last);
603 + if (s->here->e_value_inum) {
604 + ext4_xattr_inode_unlink(inode,
605 + le32_to_cpu(s->here->e_value_inum));
606 + s->here->e_value_inum = 0;
609 /* Remove the old name. */
610 size_t size = EXT4_XATTR_LEN(name_len);
611 @@ -700,10 +1006,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
613 /* Insert the new value. */
614 s->here->e_value_size = cpu_to_le32(i->value_len);
615 - if (i->value_len) {
617 + unsigned long ea_ino = le32_to_cpu(s->here->e_value_inum);
618 + ext4_xattr_inode_set(handle, inode, &ea_ino, i->value,
620 + s->here->e_value_inum = cpu_to_le32(ea_ino);
621 + s->here->e_value_offs = 0;
622 + } else if (i->value_len) {
623 size_t size = EXT4_XATTR_SIZE(i->value_len);
624 void *val = s->base + min_offs - size;
625 s->here->e_value_offs = cpu_to_le16(min_offs - size);
626 + s->here->e_value_inum = 0;
627 if (i->value == EXT4_ZERO_XATTR_VALUE) {
628 memset(val, 0, size);
630 @@ -753,7 +1066,7 @@ ext4_xattr_block_find(struct inode *inod
631 bs->s.end = bs->bh->b_data + bs->bh->b_size;
632 bs->s.here = bs->s.first;
633 error = ext4_xattr_find_entry(&bs->s.here, i->name_index,
634 - i->name, bs->bh->b_size, 1);
635 + i->name, bs->bh->b_size, 1, inode);
636 if (error && error != -ENODATA)
638 bs->s.not_found = error;
639 @@ -777,8 +1090,6 @@ ext4_xattr_block_set(handle_t *handle, s
641 #define header(x) ((struct ext4_xattr_header *)(x))
643 - if (i->value && i->value_len > sb->s_blocksize)
646 ce = mb_cache_entry_get(ext4_xattr_cache, bs->bh->b_bdev,
648 @@ -794,7 +1105,7 @@ ext4_xattr_block_set(handle_t *handle, s
651 ea_bdebug(bs->bh, "modifying in-place");
652 - error = ext4_xattr_set_entry(i, s);
653 + error = ext4_xattr_set_entry(i, s, handle, inode);
655 if (!IS_LAST_ENTRY(s->first))
656 ext4_xattr_rehash(header(s->base),
657 @@ -845,7 +1156,7 @@ ext4_xattr_block_set(handle_t *handle, s
658 s->end = s->base + sb->s_blocksize;
661 - error = ext4_xattr_set_entry(i, s);
662 + error = ext4_xattr_set_entry(i, s, handle, inode);
666 @@ -994,7 +1305,7 @@ int ext4_xattr_ibody_find(struct inode *
667 /* Find the named attribute. */
668 error = ext4_xattr_find_entry(&is->s.here, i->name_index,
670 - (void *)is->s.base, 0);
671 + (void *)is->s.base, 0, inode);
672 if (error && error != -ENODATA)
674 is->s.not_found = error;
675 @@ -1012,7 +1323,7 @@ int ext4_xattr_ibody_inline_set(handle_t
677 if (EXT4_I(inode)->i_extra_isize == 0)
679 - error = ext4_xattr_set_entry(i, s);
680 + error = ext4_xattr_set_entry(i, s, handle, inode);
682 if (error == -ENOSPC &&
683 ext4_has_inline_data(inode)) {
684 @@ -1024,7 +1335,7 @@ int ext4_xattr_ibody_inline_set(handle_t
685 error = ext4_xattr_ibody_find(inode, i, is);
688 - error = ext4_xattr_set_entry(i, s);
689 + error = ext4_xattr_set_entry(i, s, handle, inode);
693 @@ -1050,7 +1361,7 @@ static int ext4_xattr_ibody_set(handle_t
695 if (EXT4_I(inode)->i_extra_isize == 0)
697 - error = ext4_xattr_set_entry(i, s);
698 + error = ext4_xattr_set_entry(i, s, handle, inode);
701 header = IHDR(inode, ext4_raw_inode(&is->iloc));
702 @@ -1086,7 +1397,7 @@ ext4_xattr_set_handle(handle_t *handle,
705 .value_len = value_len,
709 struct ext4_xattr_ibody_find is = {
710 .s = { .not_found = -ENODATA, },
711 @@ -1151,6 +1462,15 @@ ext4_xattr_set_handle(handle_t *handle,
714 error = ext4_xattr_block_set(handle, inode, &i, &bs);
715 + if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
716 + EXT4_FEATURE_INCOMPAT_EA_INODE) &&
717 + error == -ENOSPC) {
718 + /* xattr not fit to block, store at external
721 + error = ext4_xattr_ibody_set(handle, inode,
726 if (!is.s.not_found) {
727 @@ -1197,9 +1517,22 @@ ext4_xattr_set(struct inode *inode, int
728 const void *value, size_t value_len, int flags)
731 + struct super_block *sb = inode->i_sb;
732 int error, retries = 0;
733 int credits = ext4_jbd2_credits_xattr(inode);
735 + if ((value_len >= EXT4_XATTR_MIN_LARGE_EA_SIZE(sb->s_blocksize)) &&
736 + EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EA_INODE)) {
737 + int nrblocks = (value_len + sb->s_blocksize - 1) >>
738 + sb->s_blocksize_bits;
740 + /* For new inode */
741 + credits += EXT4_SINGLEDATA_TRANS_BLOCKS(sb) + 3;
743 + /* For data blocks of EA inode */
744 + credits += ext4_meta_trans_blocks(inode, nrblocks, 0);
748 handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);
749 if (IS_ERR(handle)) {
750 @@ -1211,7 +1544,7 @@ retry:
751 value, value_len, flags);
752 error2 = ext4_journal_stop(handle);
753 if (error == -ENOSPC &&
754 - ext4_should_retry_alloc(inode->i_sb, &retries))
755 + ext4_should_retry_alloc(sb, &retries))
759 @@ -1233,7 +1566,7 @@ static void ext4_xattr_shift_entries(str
761 /* Adjust the value offsets of the entries */
762 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
763 - if (!last->e_value_block && last->e_value_size) {
764 + if (!last->e_value_inum && last->e_value_size) {
765 new_offs = le16_to_cpu(last->e_value_offs) +
767 BUG_ON(new_offs + le32_to_cpu(last->e_value_size)
768 @@ -1472,21 +1805,135 @@ cleanup:
772 +#define EIA_INCR 16 /* must be 2^n */
773 +#define EIA_MASK (EIA_INCR - 1)
774 +/* Add the large xattr @ino into @lea_ino_array for later deletion.
775 + * If @lea_ino_array is new or full it will be grown and the old
776 + * contents copied over.
779 +ext4_expand_ino_array(struct ext4_xattr_ino_array **lea_ino_array, __u32 ino)
781 + if (*lea_ino_array == NULL) {
783 + * Start with 15 inodes, so it fits into a power-of-two size.
784 + * If *lea_ino_array is NULL, this is essentially offsetof()
787 + kmalloc(offsetof(struct ext4_xattr_ino_array,
788 + xia_inodes[EIA_MASK]),
790 + if (*lea_ino_array == NULL)
792 + (*lea_ino_array)->xia_count = 0;
793 + } else if (((*lea_ino_array)->xia_count & EIA_MASK) == EIA_MASK) {
794 + /* expand the array once all 15 + n * 16 slots are full */
795 + struct ext4_xattr_ino_array *new_array = NULL;
796 + int count = (*lea_ino_array)->xia_count;
798 + /* if new_array is NULL, this is essentially offsetof() */
799 + new_array = kmalloc(
800 + offsetof(struct ext4_xattr_ino_array,
801 + xia_inodes[count + EIA_INCR]),
803 + if (new_array == NULL)
805 + memcpy(new_array, *lea_ino_array,
806 + offsetof(struct ext4_xattr_ino_array,
807 + xia_inodes[count]));
808 + kfree(*lea_ino_array);
809 + *lea_ino_array = new_array;
811 + (*lea_ino_array)->xia_inodes[(*lea_ino_array)->xia_count++] = ino;
816 + * Add xattr inode to orphan list
819 +ext4_xattr_inode_orphan_add(handle_t *handle, struct inode *inode,
820 + int credits, struct ext4_xattr_ino_array *lea_ino_array)
822 + struct inode *ea_inode = NULL;
823 + int idx = 0, error = 0;
825 + if (lea_ino_array == NULL)
828 + for (; idx < lea_ino_array->xia_count; ++idx) {
829 + if (!ext4_handle_has_enough_credits(handle, credits)) {
830 + error = ext4_journal_extend(handle, credits);
832 + error = ext4_journal_restart(handle, credits);
835 + ext4_warning(inode->i_sb,
836 + "couldn't extend journal "
837 + "(err %d)", error);
841 + ea_inode = ext4_xattr_inode_iget(inode,
842 + lea_ino_array->xia_inodes[idx], &error);
845 + ext4_orphan_add(handle, ea_inode);
846 + /* the inode's i_count will be released by caller */
853 * ext4_xattr_delete_inode()
855 - * Free extended attribute resources associated with this inode. This
856 + * Free extended attribute resources associated with this inode. Traverse
857 + * all entries and unlink any xattr inodes associated with this inode. This
858 * is called immediately before an inode is freed. We have exclusive
859 - * access to the inode.
860 + * access to the inode. If an orphan inode is deleted it will also delete any
861 + * xattr block and all xattr inodes. They are checked by ext4_xattr_inode_iget()
862 + * to ensure they belong to the parent inode and were not deleted already.
865 -ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
867 +ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
868 + struct ext4_xattr_ino_array **lea_ino_array)
870 struct buffer_head *bh = NULL;
871 + struct ext4_xattr_ibody_header *header;
872 + struct ext4_inode *raw_inode;
873 + struct ext4_iloc iloc;
874 + struct ext4_xattr_entry *entry;
875 + int credits = 3, error = 0;
877 - if (!EXT4_I(inode)->i_file_acl)
878 + if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR))
879 + goto delete_external_ea;
881 + error = ext4_get_inode_loc(inode, &iloc);
884 + raw_inode = ext4_raw_inode(&iloc);
885 + header = IHDR(inode, raw_inode);
886 + for (entry = IFIRST(header); !IS_LAST_ENTRY(entry);
887 + entry = EXT4_XATTR_NEXT(entry)) {
888 + if (!entry->e_value_inum)
890 + if (ext4_expand_ino_array(lea_ino_array,
891 + entry->e_value_inum) != 0) {
895 + entry->e_value_inum = 0;
900 + if (!EXT4_I(inode)->i_file_acl) {
901 + /* add xattr inode to orphan list */
902 + ext4_xattr_inode_orphan_add(handle, inode, credits,
906 bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
908 EXT4_ERROR_INODE(inode, "block %llu read error",
909 @@ -1499,11 +1946,69 @@ ext4_xattr_delete_inode(handle_t *handle
910 EXT4_I(inode)->i_file_acl);
914 + for (entry = BFIRST(bh); !IS_LAST_ENTRY(entry);
915 + entry = EXT4_XATTR_NEXT(entry)) {
916 + if (!entry->e_value_inum)
918 + if (ext4_expand_ino_array(lea_ino_array,
919 + entry->e_value_inum) != 0)
921 + entry->e_value_inum = 0;
924 + /* add xattr inode to orphan list */
925 + error = ext4_xattr_inode_orphan_add(handle, inode, credits,
930 + if (!IS_NOQUOTA(inode))
931 + credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
933 + if (!ext4_handle_has_enough_credits(handle, credits)) {
934 + error = ext4_journal_extend(handle, credits);
936 + error = ext4_journal_restart(handle, credits);
938 + ext4_warning(inode->i_sb,
939 + "couldn't extend journal (err %d)", error);
944 ext4_xattr_release_block(handle, inode, bh);
945 EXT4_I(inode)->i_file_acl = 0;
954 +ext4_xattr_inode_array_free(struct inode *inode,
955 + struct ext4_xattr_ino_array *lea_ino_array)
957 + struct inode *ea_inode = NULL;
961 + if (lea_ino_array == NULL)
964 + for (; idx < lea_ino_array->xia_count; ++idx) {
965 + ea_inode = ext4_xattr_inode_iget(inode,
966 + lea_ino_array->xia_inodes[idx], &err);
969 + /* for inode's i_count get from ext4_xattr_delete_inode */
970 + if (!list_empty(&EXT4_I(ea_inode)->i_orphan))
972 + clear_nlink(ea_inode);
975 + kfree(lea_ino_array);
979 @@ -1573,10 +2078,9 @@ ext4_xattr_cmp(struct ext4_xattr_header
980 entry1->e_name_index != entry2->e_name_index ||
981 entry1->e_name_len != entry2->e_name_len ||
982 entry1->e_value_size != entry2->e_value_size ||
983 + entry1->e_value_inum != entry2->e_value_inum ||
984 memcmp(entry1->e_name, entry2->e_name, entry1->e_name_len))
986 - if (entry1->e_value_block != 0 || entry2->e_value_block != 0)
988 if (memcmp((char *)header1 + le16_to_cpu(entry1->e_value_offs),
989 (char *)header2 + le16_to_cpu(entry2->e_value_offs),
990 le32_to_cpu(entry1->e_value_size)))
991 @@ -1660,7 +2164,7 @@ static inline void ext4_xattr_hash_entry
995 - if (entry->e_value_block == 0 && entry->e_value_size != 0) {
996 + if (!entry->e_value_inum && entry->e_value_size) {
997 __le32 *value = (__le32 *)((char *)header +
998 le16_to_cpu(entry->e_value_offs));
999 for (n = (le32_to_cpu(entry->e_value_size) +
1000 Index: linux-stage/fs/ext4/xattr.h
1001 ===================================================================
1002 --- linux-stage.orig/fs/ext4/xattr.h
1003 +++ linux-stage/fs/ext4/xattr.h
1004 @@ -42,7 +42,7 @@ struct ext4_xattr_entry {
1005 __u8 e_name_len; /* length of name */
1006 __u8 e_name_index; /* attribute name index */
1007 __le16 e_value_offs; /* offset in disk block of value */
1008 - __le32 e_value_block; /* disk block attribute is stored on (n/i) */
1009 + __le32 e_value_inum; /* inode in which the value is stored */
1010 __le32 e_value_size; /* size of attribute value */
1011 __le32 e_hash; /* hash value of name and value */
1012 char e_name[0]; /* attribute name */
1013 @@ -67,6 +67,26 @@ struct ext4_xattr_entry {
1014 EXT4_I(inode)->i_extra_isize))
1015 #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
1018 + * Link EA inode back to parent one using i_mtime field.
1019 + * Extra integer type conversion added to ignore higher
1020 + * bits in i_mtime.tv_sec which might be set by ext4_get()
1022 +#define EXT4_XATTR_INODE_SET_PARENT(inode, inum) \
1024 + (inode)->i_mtime.tv_sec = inum; \
1027 +#define EXT4_XATTR_INODE_GET_PARENT(inode) \
1028 + ((__u32)(inode)->i_mtime.tv_sec)
1031 + * The minimum size of EA value when you start storing it in an external inode
1032 + * size of block - size of header - size of 1 entry - 4 null bytes
1034 +#define EXT4_XATTR_MIN_LARGE_EA_SIZE(b) \
1035 + ((b) - EXT4_XATTR_LEN(3) - sizeof(struct ext4_xattr_header) - 4)
1037 #define BHDR(bh) ((struct ext4_xattr_header *)((bh)->b_data))
1038 #define ENTRY(ptr) ((struct ext4_xattr_entry *)(ptr))
1039 #define BFIRST(bh) ENTRY(BHDR(bh)+1)
1040 @@ -75,10 +84,11 @@ struct ext4_xattr_entry {
1041 #define EXT4_ZERO_XATTR_VALUE ((void *)-1)
1043 struct ext4_xattr_info {
1052 struct ext4_xattr_search {
1053 @@ -106,7 +116,13 @@ extern int ext4_xattr_get(struct inode *
1054 extern int ext4_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
1055 extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
1057 -extern void ext4_xattr_delete_inode(handle_t *, struct inode *);
1058 +extern struct inode *ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,
1060 +extern int ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino);
1061 +extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
1062 + struct ext4_xattr_ino_array **array);
1063 +extern void ext4_xattr_inode_array_free(struct inode *inode,
1064 + struct ext4_xattr_ino_array *array);
1065 extern void ext4_xattr_put_super(struct super_block *);
1067 extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
1068 Index: linux-stage/fs/ext4/ialloc.c
1069 ===================================================================
1070 --- linux-stage.orig/fs/ext4/ialloc.c
1071 +++ linux-stage/fs/ext4/ialloc.c
1072 @@ -252,7 +252,6 @@ void ext4_free_inode(handle_t *handle, s
1073 * as writing the quota to disk may need the lock as well.
1075 dquot_initialize(inode);
1076 - ext4_xattr_delete_inode(handle, inode);
1077 dquot_free_inode(inode);
1080 Index: linux-stage/fs/ext4/inline.c
1081 ===================================================================
1082 --- linux-stage.orig/fs/ext4/inline.c
1083 +++ linux-stage/fs/ext4/inline.c
1084 @@ -59,7 +59,7 @@ static int get_max_inline_xattr_value_si
1086 /* Compute min_offs. */
1087 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
1088 - if (!entry->e_value_block && entry->e_value_size) {
1089 + if (!entry->e_value_inum && entry->e_value_size) {
1090 size_t offs = le16_to_cpu(entry->e_value_offs);
1091 if (offs < min_offs)