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 @@ -1579,6 +1579,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 @@ -1990,6 +1997,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 @@ -2194,6 +2205,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_zero_partial_blocks(handle_t *handle, struct inode *inode,
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 @@ -134,8 +134,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 @@ -184,6 +182,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 @@ -236,8 +236,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 @@ -249,9 +249,36 @@ void ext4_evict_inode(struct inode *inod
72 sb_end_intwrite(inode->i_sb);
77 ext4_handle_sync(handle);
80 + * Delete xattr inode before deleting the main inode.
82 + err = ext4_xattr_delete_inode(handle, inode, &lea_ino_array);
84 + ext4_warning(inode->i_sb,
85 + "couldn't delete inode's xattr (err %d)", err);
89 + if (!IS_NOQUOTA(inode))
90 + extra_credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
92 + if (!ext4_handle_has_enough_credits(handle,
93 + ext4_blocks_for_truncate(inode) + extra_credits)) {
94 + err = ext4_journal_extend(handle,
95 + ext4_blocks_for_truncate(inode) + extra_credits);
97 + err = ext4_journal_restart(handle,
98 + ext4_blocks_for_truncate(inode) + extra_credits);
100 + ext4_warning(inode->i_sb,
101 + "couldn't extend journal (err %d)", err);
107 err = ext4_mark_inode_dirty(handle, inode);
109 @@ -269,10 +296,10 @@ void ext4_evict_inode(struct inode *inod
110 * enough credits left in the handle to remove the inode from
111 * the orphan list and set the dtime field.
113 - if (!ext4_handle_has_enough_credits(handle, 3)) {
114 - err = ext4_journal_extend(handle, 3);
115 + if (!ext4_handle_has_enough_credits(handle, extra_credits)) {
116 + err = ext4_journal_extend(handle, extra_credits);
118 - err = ext4_journal_restart(handle, 3);
119 + err = ext4_journal_restart(handle, extra_credits);
121 ext4_warning(inode->i_sb,
122 "couldn't extend journal (err %d)", err);
123 @@ -306,8 +333,12 @@ void ext4_evict_inode(struct inode *inod
124 ext4_clear_inode(inode);
126 ext4_free_inode(handle, inode);
128 ext4_journal_stop(handle);
129 sb_end_intwrite(inode->i_sb);
131 + if (lea_ino_array != NULL)
132 + ext4_xattr_inode_array_free(inode, lea_ino_array);
135 ext4_clear_inode(inode); /* We must guarantee clearing of inode... */
136 @@ -4681,7 +4712,7 @@ static int ext4_index_trans_blocks(struc
138 * Also account for superblock, inode, quota and xattr blocks
140 -static int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
141 +int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
144 ext4_group_t groups, ngroups = ext4_get_groups_count(inode->i_sb);
145 Index: linux-stage/fs/ext4/xattr.c
146 ===================================================================
147 --- linux-stage.orig/fs/ext4/xattr.c
148 +++ linux-stage/fs/ext4/xattr.c
149 @@ -204,6 +204,7 @@ ext4_xattr_check_names(struct ext4_xattr
151 while (!IS_LAST_ENTRY(entry)) {
152 if (entry->e_value_size != 0 &&
153 + entry->e_value_inum == 0 &&
154 (value_start + le16_to_cpu(entry->e_value_offs) <
155 (void *)e + sizeof(__u32) ||
156 value_start + le16_to_cpu(entry->e_value_offs) +
157 @@ -257,19 +258,26 @@ errout:
158 __xattr_check_inode((inode), (header), (end), __func__, __LINE__)
161 -ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size)
162 +ext4_xattr_check_entry(struct ext4_xattr_entry *entry, size_t size,
163 + struct inode *inode)
165 size_t value_size = le32_to_cpu(entry->e_value_size);
167 - if (entry->e_value_block != 0 || value_size > size ||
168 + if (!entry->e_value_inum &&
169 le16_to_cpu(entry->e_value_offs) + value_size > size)
170 return -EFSCORRUPTED;
171 + if (entry->e_value_inum &&
172 + (le32_to_cpu(entry->e_value_inum) < EXT4_FIRST_INO(inode->i_sb) ||
173 + le32_to_cpu(entry->e_value_inum) >
174 + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_inodes_count)))
175 + return -EFSCORRUPTED;
180 ext4_xattr_find_entry(struct ext4_xattr_entry **pentry, int name_index,
181 - const char *name, size_t size, int sorted)
182 + const char *name, size_t size, int sorted,
183 + struct inode *inode)
185 struct ext4_xattr_entry *entry;
187 @@ -289,11 +297,104 @@ ext4_xattr_find_entry(struct ext4_xattr_
191 - if (!cmp && ext4_xattr_check_entry(entry, size))
192 + if (!cmp && ext4_xattr_check_entry(entry, size, inode))
193 return -EFSCORRUPTED;
194 return cmp ? -ENODATA : 0;
198 + * Read the EA value from an inode.
201 +ext4_xattr_inode_read(struct inode *ea_inode, void *buf, size_t *size)
203 + unsigned long block = 0;
204 + struct buffer_head *bh = NULL;
206 + size_t csize, ret_size = 0;
211 + blocksize = ea_inode->i_sb->s_blocksize;
213 + while (ret_size < *size) {
214 + csize = (*size - ret_size) > blocksize ? blocksize :
216 + bh = ext4_bread(NULL, ea_inode, block, 0);
219 + return PTR_ERR(bh);
221 + memcpy(buf, bh->b_data, csize);
234 +struct inode *ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, int *err)
236 + struct inode *ea_inode = NULL;
238 + ea_inode = ext4_iget(parent->i_sb, ea_ino);
239 + if (IS_ERR(ea_inode) || is_bad_inode(ea_inode)) {
240 + int rc = IS_ERR(ea_inode) ? PTR_ERR(ea_inode) : 0;
241 + ext4_error(parent->i_sb, "error while reading EA inode %lu "
242 + "/ %d %d", ea_ino, rc, is_bad_inode(ea_inode));
243 + *err = rc != 0 ? rc : -EIO;
247 + if (EXT4_XATTR_INODE_GET_PARENT(ea_inode) != parent->i_ino ||
248 + ea_inode->i_generation != parent->i_generation) {
249 + ext4_error(parent->i_sb, "Backpointer from EA inode %lu "
250 + "to parent invalid.", ea_ino);
255 + if (!(EXT4_I(ea_inode)->i_flags & EXT4_EA_INODE_FL)) {
256 + ext4_error(parent->i_sb, "EA inode %lu does not have "
257 + "EXT4_EA_INODE_FL flag set.\n", ea_ino);
271 + * Read the value from the EA inode.
274 +ext4_xattr_inode_get(struct inode *inode, unsigned long ea_ino, void *buffer,
277 + struct inode *ea_inode = NULL;
280 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
284 + err = ext4_xattr_inode_read(ea_inode, buffer, size);
291 ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,
292 void *buffer, size_t buffer_size)
293 @@ -326,7 +427,8 @@ bad_block:
295 ext4_xattr_cache_insert(ext4_mb_cache, bh);
297 - error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1);
298 + error = ext4_xattr_find_entry(&entry, name_index, name, bh->b_size, 1,
300 if (error == -EFSCORRUPTED)
303 @@ -336,8 +438,16 @@ bad_block:
305 if (size > buffer_size)
307 - memcpy(buffer, bh->b_data + le16_to_cpu(entry->e_value_offs),
309 + if (entry->e_value_inum) {
310 + error = ext4_xattr_inode_get(inode,
311 + le32_to_cpu(entry->e_value_inum),
316 + memcpy(buffer, bh->b_data +
317 + le16_to_cpu(entry->e_value_offs), size);
322 @@ -371,7 +481,7 @@ ext4_xattr_ibody_get(struct inode *inode
325 error = ext4_xattr_find_entry(&entry, name_index, name,
326 - end - (void *)entry, 0);
327 + end - (void *)entry, 0, inode);
330 size = le32_to_cpu(entry->e_value_size);
331 @@ -379,8 +489,16 @@ ext4_xattr_ibody_get(struct inode *inode
333 if (size > buffer_size)
335 - memcpy(buffer, (void *)IFIRST(header) +
336 - le16_to_cpu(entry->e_value_offs), size);
337 + if (entry->e_value_inum) {
338 + error = ext4_xattr_inode_get(inode,
339 + le32_to_cpu(entry->e_value_inum),
344 + memcpy(buffer, (void *)IFIRST(header) +
345 + le16_to_cpu(entry->e_value_offs), size);
350 @@ -640,7 +758,7 @@ static size_t ext4_xattr_free_space(stru
351 size_t *min_offs, void *base, int *total)
353 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
354 - if (!last->e_value_block && last->e_value_size) {
355 + if (!last->e_value_inum && last->e_value_size) {
356 size_t offs = le16_to_cpu(last->e_value_offs);
357 if (offs < *min_offs)
359 @@ -651,12 +769,195 @@ static size_t ext4_xattr_free_space(stru
360 return (*min_offs - ((void *)last - base) - sizeof(__u32));
364 + * Write the value of the EA in an inode.
367 +ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode,
368 + const void *buf, int bufsize)
370 + struct buffer_head *bh = NULL;
371 + unsigned long block = 0;
372 + unsigned blocksize = ea_inode->i_sb->s_blocksize;
373 + unsigned max_blocks = (bufsize + blocksize - 1) >> ea_inode->i_blkbits;
374 + int csize, wsize = 0;
379 + while (ret >= 0 && ret < max_blocks) {
380 + struct ext4_map_blocks map;
381 + map.m_lblk = block += ret;
382 + map.m_len = max_blocks -= ret;
384 + ret = ext4_map_blocks(handle, ea_inode, &map,
385 + EXT4_GET_BLOCKS_CREATE);
387 + ext4_mark_inode_dirty(handle, ea_inode);
388 + if (ret == -ENOSPC &&
389 + ext4_should_retry_alloc(ea_inode->i_sb, &retries)) {
401 + while (wsize < bufsize) {
404 + csize = (bufsize - wsize) > blocksize ? blocksize :
406 + bh = ext4_getblk(handle, ea_inode, block, 0);
411 + ret = ext4_journal_get_write_access(handle, bh);
415 + memcpy(bh->b_data, buf, csize);
416 + set_buffer_uptodate(bh);
417 + ext4_handle_dirty_metadata(handle, ea_inode, bh);
424 + mutex_lock(&ea_inode->i_mutex);
425 + i_size_write(ea_inode, wsize);
426 + ext4_update_i_disksize(ea_inode, wsize);
427 + mutex_unlock(&ea_inode->i_mutex);
429 + ext4_mark_inode_dirty(handle, ea_inode);
437 +static void ext4_xattr_inode_set_ref(struct inode *ea_inode, __u64 ref_count)
439 + ea_inode->i_ctime.tv_sec = (__u32)(ref_count >> 32);
440 + ea_inode->i_version = (__u32)ref_count;
443 +static void ext4_xattr_inode_set_hash(struct inode *ea_inode, __u32 hash)
445 + ea_inode->i_atime.tv_sec = hash;
449 + * Create an inode to store the value of a large EA.
451 +static struct inode *
452 +ext4_xattr_inode_create(handle_t *handle, struct inode *inode, __u32 hash)
454 + struct inode *ea_inode = NULL;
457 + * Let the next inode be the goal, so we try and allocate the EA inode
458 + * in the same group, or nearby one.
460 + ea_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode,
461 + S_IFREG|0600, NULL, inode->i_ino + 1, NULL);
463 + if (!IS_ERR(ea_inode)) {
464 + ea_inode->i_op = &ext4_file_inode_operations;
465 + ea_inode->i_fop = &ext4_file_operations;
466 + ext4_set_aops(ea_inode);
467 + ea_inode->i_generation = inode->i_generation;
468 + EXT4_I(ea_inode)->i_flags |= EXT4_EA_INODE_FL;
471 + * A back-pointer from EA inode to parent inode will be useful
474 + EXT4_XATTR_INODE_SET_PARENT(ea_inode, inode->i_ino);
475 + unlock_new_inode(ea_inode);
477 + ext4_xattr_inode_set_ref(ea_inode, 1);
478 + ext4_xattr_inode_set_hash(ea_inode, hash);
485 + * Unlink the inode storing the value of the EA.
488 +ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino)
490 + struct inode *ea_inode = NULL;
493 + ea_inode = ext4_xattr_inode_iget(inode, ea_ino, &err);
497 + clear_nlink(ea_inode);
504 +ext4_xattr_inode_hash(struct ext4_sb_info *sbi, const void *buffer, size_t size)
506 + if (ext4_has_metadata_csum(sbi->s_sb))
507 + return ext4_chksum(sbi, sbi->s_csum_seed, buffer, size);
512 + * Add value of the EA in an inode.
515 +ext4_xattr_inode_set(handle_t *handle, struct inode *inode, unsigned long *ea_ino,
516 + const void *value, size_t value_len)
518 + struct inode *ea_inode = NULL;
522 + /* Create an inode for the EA value */
523 + hash = ext4_xattr_inode_hash(EXT4_SB(inode->i_sb), value, value_len);
524 + ea_inode = ext4_xattr_inode_create(handle, inode, hash);
525 + if (IS_ERR(ea_inode))
528 + err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);
530 + clear_nlink(ea_inode);
532 + *ea_ino = ea_inode->i_ino;
540 ext4_xattr_set_entry(struct ext4_xattr_info *i, struct ext4_xattr_search *s,
541 - struct inode *inode)
542 + handle_t *handle, struct inode *inode)
544 struct ext4_xattr_entry *last, *next;
545 size_t free, min_offs = s->end - s->base, name_len = strlen(i->name);
546 + int in_inode = i->in_inode;
548 + if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
549 + EXT4_FEATURE_INCOMPAT_EA_INODE) &&
550 + (EXT4_XATTR_SIZE(i->value_len) >
551 + EXT4_XATTR_MIN_LARGE_EA_SIZE(inode->i_sb->s_blocksize)))
554 /* Compute min_offs and last. */
556 @@ -666,7 +967,7 @@ ext4_xattr_set_entry(struct ext4_xattr_i
557 EXT4_ERROR_INODE(inode, "corrupted xattr entries");
558 return -EFSCORRUPTED;
560 - if (!last->e_value_block && last->e_value_size) {
561 + if (!last->e_value_inum && last->e_value_size) {
562 size_t offs = le16_to_cpu(last->e_value_offs);
565 @@ -674,15 +975,20 @@ ext4_xattr_set_entry(struct ext4_xattr_i
567 free = min_offs - ((void *)last - s->base) - sizeof(__u32);
569 - if (!s->here->e_value_block && s->here->e_value_size) {
571 + !s->here->e_value_inum && s->here->e_value_size) {
572 size_t size = le32_to_cpu(s->here->e_value_size);
573 free += EXT4_XATTR_SIZE(size);
575 free += EXT4_XATTR_LEN(name_len);
578 - if (free < EXT4_XATTR_LEN(name_len) +
579 - EXT4_XATTR_SIZE(i->value_len))
580 + size_t value_len = EXT4_XATTR_SIZE(i->value_len);
585 + if (free < EXT4_XATTR_LEN(name_len) + value_len)
589 @@ -696,7 +1002,8 @@ ext4_xattr_set_entry(struct ext4_xattr_i
590 s->here->e_name_len = name_len;
591 memcpy(s->here->e_name, i->name, name_len);
593 - if (!s->here->e_value_block && s->here->e_value_size) {
594 + if (!s->here->e_value_inum && s->here->e_value_size &&
595 + s->here->e_value_offs > 0) {
596 void *first_val = s->base + min_offs;
597 size_t offs = le16_to_cpu(s->here->e_value_offs);
598 void *val = s->base + offs;
599 @@ -730,13 +1037,18 @@ ext4_xattr_set_entry(struct ext4_xattr_i
601 while (!IS_LAST_ENTRY(last)) {
602 size_t o = le16_to_cpu(last->e_value_offs);
603 - if (!last->e_value_block &&
604 + if (!last->e_value_inum &&
605 last->e_value_size && o < offs)
607 cpu_to_le16(o + size);
608 last = EXT4_XATTR_NEXT(last);
611 + if (s->here->e_value_inum) {
612 + ext4_xattr_inode_unlink(inode,
613 + le32_to_cpu(s->here->e_value_inum));
614 + s->here->e_value_inum = 0;
617 /* Remove the old name. */
618 size_t size = EXT4_XATTR_LEN(name_len);
619 @@ -750,10 +1062,17 @@ ext4_xattr_set_entry(struct ext4_xattr_i
621 /* Insert the new value. */
622 s->here->e_value_size = cpu_to_le32(i->value_len);
623 - if (i->value_len) {
625 + unsigned long ea_ino = le32_to_cpu(s->here->e_value_inum);
626 + ext4_xattr_inode_set(handle, inode, &ea_ino, i->value,
628 + s->here->e_value_inum = cpu_to_le32(ea_ino);
629 + s->here->e_value_offs = 0;
630 + } else if (i->value_len) {
631 size_t size = EXT4_XATTR_SIZE(i->value_len);
632 void *val = s->base + min_offs - size;
633 s->here->e_value_offs = cpu_to_le16(min_offs - size);
634 + s->here->e_value_inum = 0;
635 if (i->value == EXT4_ZERO_XATTR_VALUE) {
636 memset(val, 0, size);
638 @@ -803,7 +1122,7 @@ ext4_xattr_block_find(struct inode *inod
639 bs->s.end = bs->bh->b_data + bs->bh->b_size;
640 bs->s.here = bs->s.first;
641 error = ext4_xattr_find_entry(&bs->s.here, i->name_index,
642 - i->name, bs->bh->b_size, 1);
643 + i->name, bs->bh->b_size, 1, inode);
644 if (error && error != -ENODATA)
646 bs->s.not_found = error;
647 @@ -828,8 +1147,6 @@ ext4_xattr_block_set(handle_t *handle, s
649 #define header(x) ((struct ext4_xattr_header *)(x))
651 - if (i->value && i->value_len > sb->s_blocksize)
654 BUFFER_TRACE(bs->bh, "get_write_access");
655 error = ext4_journal_get_write_access(handle, bs->bh);
656 @@ -848,7 +1165,7 @@ ext4_xattr_block_set(handle_t *handle, s
657 mb_cache_entry_delete_block(ext4_mb_cache, hash,
659 ea_bdebug(bs->bh, "modifying in-place");
660 - error = ext4_xattr_set_entry(i, s, inode);
661 + error = ext4_xattr_set_entry(i, s, handle, inode);
663 if (!IS_LAST_ENTRY(s->first))
664 ext4_xattr_rehash(header(s->base),
665 @@ -894,7 +1211,7 @@ ext4_xattr_block_set(handle_t *handle, s
666 s->end = s->base + sb->s_blocksize;
669 - error = ext4_xattr_set_entry(i, s, inode);
670 + error = ext4_xattr_set_entry(i, s, handle, inode);
671 if (error == -EFSCORRUPTED)
674 @@ -1072,7 +1389,7 @@ int ext4_xattr_ibody_find(struct inode *
675 /* Find the named attribute. */
676 error = ext4_xattr_find_entry(&is->s.here, i->name_index,
678 - (void *)is->s.base, 0);
679 + (void *)is->s.base, 0, inode);
680 if (error && error != -ENODATA)
682 is->s.not_found = error;
683 @@ -1090,7 +1407,7 @@ int ext4_xattr_ibody_inline_set(handle_t
685 if (EXT4_I(inode)->i_extra_isize == 0)
687 - error = ext4_xattr_set_entry(i, s, inode);
688 + error = ext4_xattr_set_entry(i, s, handle, inode);
691 header = IHDR(inode, ext4_raw_inode(&is->iloc));
692 @@ -1114,7 +1431,7 @@ static int ext4_xattr_ibody_set(handle_t
694 if (EXT4_I(inode)->i_extra_isize == 0)
696 - error = ext4_xattr_set_entry(i, s, inode);
697 + error = ext4_xattr_set_entry(i, s, handle, inode);
700 header = IHDR(inode, ext4_raw_inode(&is->iloc));
701 @@ -1161,7 +1478,7 @@ ext4_xattr_set_handle(handle_t *handle,
704 .value_len = value_len,
708 struct ext4_xattr_ibody_find is = {
709 .s = { .not_found = -ENODATA, },
710 @@ -1231,6 +1548,15 @@ ext4_xattr_set_handle(handle_t *handle,
713 error = ext4_xattr_block_set(handle, inode, &i, &bs);
714 + if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
715 + EXT4_FEATURE_INCOMPAT_EA_INODE) &&
716 + error == -ENOSPC) {
717 + /* xattr not fit to block, store at external
720 + error = ext4_xattr_ibody_set(handle, inode,
725 if (!is.s.not_found) {
726 @@ -1275,9 +1601,22 @@ ext4_xattr_set(struct inode *inode, int
727 const void *value, size_t value_len, int flags)
730 + struct super_block *sb = inode->i_sb;
731 int error, retries = 0;
732 int credits = ext4_jbd2_credits_xattr(inode);
734 + if ((value_len >= EXT4_XATTR_MIN_LARGE_EA_SIZE(sb->s_blocksize)) &&
735 + EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EA_INODE)) {
736 + int nrblocks = (value_len + sb->s_blocksize - 1) >>
737 + sb->s_blocksize_bits;
739 + /* For new inode */
740 + credits += EXT4_SINGLEDATA_TRANS_BLOCKS(sb) + 3;
742 + /* For data blocks of EA inode */
743 + credits += ext4_meta_trans_blocks(inode, nrblocks, 0);
747 handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);
748 if (IS_ERR(handle)) {
749 @@ -1289,7 +1628,7 @@ retry:
750 value, value_len, flags);
751 error2 = ext4_journal_stop(handle);
752 if (error == -ENOSPC &&
753 - ext4_should_retry_alloc(inode->i_sb, &retries))
754 + ext4_should_retry_alloc(sb, &retries))
758 @@ -1311,7 +1650,7 @@ static void ext4_xattr_shift_entries(str
760 /* Adjust the value offsets of the entries */
761 for (; !IS_LAST_ENTRY(last); last = EXT4_XATTR_NEXT(last)) {
762 - if (!last->e_value_block && last->e_value_size) {
763 + if (!last->e_value_inum && last->e_value_size) {
764 new_offs = le16_to_cpu(last->e_value_offs) +
766 BUG_ON(new_offs + le32_to_cpu(last->e_value_size)
767 @@ -1565,21 +1904,135 @@ cleanup:
771 +#define EIA_INCR 16 /* must be 2^n */
772 +#define EIA_MASK (EIA_INCR - 1)
773 +/* Add the large xattr @ino into @lea_ino_array for later deletion.
774 + * If @lea_ino_array is new or full it will be grown and the old
775 + * contents copied over.
778 +ext4_expand_ino_array(struct ext4_xattr_ino_array **lea_ino_array, __u32 ino)
780 + if (*lea_ino_array == NULL) {
782 + * Start with 15 inodes, so it fits into a power-of-two size.
783 + * If *lea_ino_array is NULL, this is essentially offsetof()
786 + kmalloc(offsetof(struct ext4_xattr_ino_array,
787 + xia_inodes[EIA_MASK]),
789 + if (*lea_ino_array == NULL)
791 + (*lea_ino_array)->xia_count = 0;
792 + } else if (((*lea_ino_array)->xia_count & EIA_MASK) == EIA_MASK) {
793 + /* expand the array once all 15 + n * 16 slots are full */
794 + struct ext4_xattr_ino_array *new_array = NULL;
795 + int count = (*lea_ino_array)->xia_count;
797 + /* if new_array is NULL, this is essentially offsetof() */
798 + new_array = kmalloc(
799 + offsetof(struct ext4_xattr_ino_array,
800 + xia_inodes[count + EIA_INCR]),
802 + if (new_array == NULL)
804 + memcpy(new_array, *lea_ino_array,
805 + offsetof(struct ext4_xattr_ino_array,
806 + xia_inodes[count]));
807 + kfree(*lea_ino_array);
808 + *lea_ino_array = new_array;
810 + (*lea_ino_array)->xia_inodes[(*lea_ino_array)->xia_count++] = ino;
815 + * Add xattr inode to orphan list
818 +ext4_xattr_inode_orphan_add(handle_t *handle, struct inode *inode,
819 + int credits, struct ext4_xattr_ino_array *lea_ino_array)
821 + struct inode *ea_inode = NULL;
822 + int idx = 0, error = 0;
824 + if (lea_ino_array == NULL)
827 + for (; idx < lea_ino_array->xia_count; ++idx) {
828 + if (!ext4_handle_has_enough_credits(handle, credits)) {
829 + error = ext4_journal_extend(handle, credits);
831 + error = ext4_journal_restart(handle, credits);
834 + ext4_warning(inode->i_sb,
835 + "couldn't extend journal "
836 + "(err %d)", error);
840 + ea_inode = ext4_xattr_inode_iget(inode,
841 + lea_ino_array->xia_inodes[idx], &error);
844 + ext4_orphan_add(handle, ea_inode);
845 + /* the inode's i_count will be released by caller */
852 * ext4_xattr_delete_inode()
854 - * Free extended attribute resources associated with this inode. This
855 + * Free extended attribute resources associated with this inode. Traverse
856 + * all entries and unlink any xattr inodes associated with this inode. This
857 * is called immediately before an inode is freed. We have exclusive
858 - * access to the inode.
859 + * access to the inode. If an orphan inode is deleted it will also delete any
860 + * xattr block and all xattr inodes. They are checked by ext4_xattr_inode_iget()
861 + * to ensure they belong to the parent inode and were not deleted already.
864 -ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
866 +ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
867 + struct ext4_xattr_ino_array **lea_ino_array)
869 struct buffer_head *bh = NULL;
870 + struct ext4_xattr_ibody_header *header;
871 + struct ext4_inode *raw_inode;
872 + struct ext4_iloc iloc;
873 + struct ext4_xattr_entry *entry;
874 + int credits = 3, error = 0;
876 - if (!EXT4_I(inode)->i_file_acl)
877 + if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR))
878 + goto delete_external_ea;
880 + error = ext4_get_inode_loc(inode, &iloc);
883 + raw_inode = ext4_raw_inode(&iloc);
884 + header = IHDR(inode, raw_inode);
885 + for (entry = IFIRST(header); !IS_LAST_ENTRY(entry);
886 + entry = EXT4_XATTR_NEXT(entry)) {
887 + if (!entry->e_value_inum)
889 + if (ext4_expand_ino_array(lea_ino_array,
890 + entry->e_value_inum) != 0) {
894 + entry->e_value_inum = 0;
899 + if (!EXT4_I(inode)->i_file_acl) {
900 + /* add xattr inode to orphan list */
901 + ext4_xattr_inode_orphan_add(handle, inode, credits,
905 bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
907 EXT4_ERROR_INODE(inode, "block %llu read error",
908 @@ -1592,11 +2045,69 @@ ext4_xattr_delete_inode(handle_t *handle
909 EXT4_I(inode)->i_file_acl);
913 + for (entry = BFIRST(bh); !IS_LAST_ENTRY(entry);
914 + entry = EXT4_XATTR_NEXT(entry)) {
915 + if (!entry->e_value_inum)
917 + if (ext4_expand_ino_array(lea_ino_array,
918 + entry->e_value_inum) != 0)
920 + entry->e_value_inum = 0;
923 + /* add xattr inode to orphan list */
924 + error = ext4_xattr_inode_orphan_add(handle, inode, credits,
929 + if (!IS_NOQUOTA(inode))
930 + credits += 2 * EXT4_QUOTA_DEL_BLOCKS(inode->i_sb);
932 + if (!ext4_handle_has_enough_credits(handle, credits)) {
933 + error = ext4_journal_extend(handle, credits);
935 + error = ext4_journal_restart(handle, credits);
937 + ext4_warning(inode->i_sb,
938 + "couldn't extend journal (err %d)", error);
943 ext4_xattr_release_block(handle, inode, bh);
944 EXT4_I(inode)->i_file_acl = 0;
953 +ext4_xattr_inode_array_free(struct inode *inode,
954 + struct ext4_xattr_ino_array *lea_ino_array)
956 + struct inode *ea_inode = NULL;
960 + if (lea_ino_array == NULL)
963 + for (; idx < lea_ino_array->xia_count; ++idx) {
964 + ea_inode = ext4_xattr_inode_iget(inode,
965 + lea_ino_array->xia_inodes[idx], &err);
968 + /* for inode's i_count get from ext4_xattr_delete_inode */
969 + if (!list_empty(&EXT4_I(ea_inode)->i_orphan))
971 + clear_nlink(ea_inode);
974 + kfree(lea_ino_array);
978 @@ -1648,10 +2159,9 @@ ext4_xattr_cmp(struct ext4_xattr_header
979 entry1->e_name_index != entry2->e_name_index ||
980 entry1->e_name_len != entry2->e_name_len ||
981 entry1->e_value_size != entry2->e_value_size ||
982 + entry1->e_value_inum != entry2->e_value_inum ||
983 memcmp(entry1->e_name, entry2->e_name, entry1->e_name_len))
985 - if (entry1->e_value_block != 0 || entry2->e_value_block != 0)
986 - return -EFSCORRUPTED;
987 if (memcmp((char *)header1 + le16_to_cpu(entry1->e_value_offs),
988 (char *)header2 + le16_to_cpu(entry2->e_value_offs),
989 le32_to_cpu(entry1->e_value_size)))
990 @@ -1723,7 +2233,7 @@ static inline void ext4_xattr_hash_entry
994 - if (entry->e_value_block == 0 && entry->e_value_size != 0) {
995 + if (!entry->e_value_inum && entry->e_value_size) {
996 __le32 *value = (__le32 *)((char *)header +
997 le16_to_cpu(entry->e_value_offs));
998 for (n = (le32_to_cpu(entry->e_value_size) +
999 Index: linux-stage/fs/ext4/xattr.h
1000 ===================================================================
1001 --- linux-stage.orig/fs/ext4/xattr.h
1002 +++ linux-stage/fs/ext4/xattr.h
1003 @@ -42,7 +42,7 @@ struct ext4_xattr_entry {
1004 __u8 e_name_len; /* length of name */
1005 __u8 e_name_index; /* attribute name index */
1006 __le16 e_value_offs; /* offset in disk block of value */
1007 - __le32 e_value_block; /* disk block attribute is stored on (n/i) */
1008 + __le32 e_value_inum; /* inode in which the value is stored */
1009 __le32 e_value_size; /* size of attribute value */
1010 __le32 e_hash; /* hash value of name and value */
1011 char e_name[0]; /* attribute name */
1012 @@ -67,6 +67,26 @@ struct ext4_xattr_entry {
1013 EXT4_I(inode)->i_extra_isize))
1014 #define IFIRST(hdr) ((struct ext4_xattr_entry *)((hdr)+1))
1017 + * Link EA inode back to parent one using i_mtime field.
1018 + * Extra integer type conversion added to ignore higher
1019 + * bits in i_mtime.tv_sec which might be set by ext4_get()
1021 +#define EXT4_XATTR_INODE_SET_PARENT(inode, inum) \
1023 + (inode)->i_mtime.tv_sec = inum; \
1026 +#define EXT4_XATTR_INODE_GET_PARENT(inode) \
1027 +((__u32)(inode)->i_mtime.tv_sec)
1030 + * The minimum size of EA value when you start storing it in an external inode
1031 + * size of block - size of header - size of 1 entry - 4 null bytes
1033 +#define EXT4_XATTR_MIN_LARGE_EA_SIZE(b) \
1034 + ((b) - EXT4_XATTR_LEN(3) - sizeof(struct ext4_xattr_header) - 4)
1036 #define BHDR(bh) ((struct ext4_xattr_header *)((bh)->b_data))
1037 #define ENTRY(ptr) ((struct ext4_xattr_entry *)(ptr))
1038 #define BFIRST(bh) ENTRY(BHDR(bh)+1)
1039 @@ -75,10 +84,11 @@ struct ext4_xattr_entry {
1040 #define EXT4_ZERO_XATTR_VALUE ((void *)-1)
1042 struct ext4_xattr_info {
1051 struct ext4_xattr_search {
1052 @@ -106,7 +116,13 @@ extern int ext4_xattr_get(struct inode *
1053 extern int ext4_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
1054 extern int ext4_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
1056 -extern void ext4_xattr_delete_inode(handle_t *, struct inode *);
1057 +extern struct inode *ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,
1059 +extern int ext4_xattr_inode_unlink(struct inode *inode, unsigned long ea_ino);
1060 +extern int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
1061 + struct ext4_xattr_ino_array **array);
1062 +extern void ext4_xattr_inode_array_free(struct inode *inode,
1063 + struct ext4_xattr_ino_array *array);
1065 extern void ext4_xattr_put_super(struct super_block *);
1066 extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
1067 Index: linux-stage/fs/ext4/ialloc.c
1068 ===================================================================
1069 --- linux-stage.orig/fs/ext4/ialloc.c
1070 +++ linux-stage/fs/ext4/ialloc.c
1071 @@ -269,7 +269,6 @@ void ext4_free_inode(handle_t *handle, s
1072 * as writing the quota to disk may need the lock as well.
1074 dquot_initialize(inode);
1075 - ext4_xattr_delete_inode(handle, inode);
1076 dquot_free_inode(inode);
1079 Index: linux-stage/fs/ext4/inline.c
1080 ===================================================================
1081 --- linux-stage.orig/fs/ext4/inline.c
1082 +++ linux-stage/fs/ext4/inline.c
1083 @@ -59,7 +59,7 @@ static int get_max_inline_xattr_value_si
1085 /* Compute min_offs. */
1086 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
1087 - if (!entry->e_value_block && entry->e_value_size) {
1088 + if (!entry->e_value_inum && entry->e_value_size) {
1089 size_t offs = le16_to_cpu(entry->e_value_offs);
1090 if (offs < min_offs)