p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ext4: propagate error values from ext4_inline_data_truncate() 

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2017-01-22 19:35:49 -05:00
parent b907f2d519
commit 01daf94525
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/ext4.h
View File

@ -3023,7 +3023,7 @@ extern int ext4_inline_data_fiemap(struct inode *inode,
extern int ext4_try_to_evict_inline_data(handle_t *handle, extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode, struct inode *inode,
int needed); int needed);
extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline); extern int ext4_inline_data_truncate(struct inode *inode, int *has_inline);
extern int ext4_convert_inline_data(struct inode *inode); extern int ext4_convert_inline_data(struct inode *inode);

40
fs/ext4/inline.c
View File

@ -1896,10 +1896,10 @@ int ext4_try_to_evict_inline_data(handle_t *handle,
return error; return error;
} }
void ext4_inline_data_truncate(struct inode *inode, int *has_inline) int ext4_inline_data_truncate(struct inode *inode, int *has_inline)
{ {
handle_t *handle; handle_t *handle;
int inline_size, value_len, needed_blocks, no_expand; int inline_size, value_len, needed_blocks, no_expand, err = 0;
size_t i_size; size_t i_size;
void *value = NULL; void *value = NULL;
struct ext4_xattr_ibody_find is = { struct ext4_xattr_ibody_find is = {
@ -1914,19 +1914,19 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
needed_blocks = ext4_writepage_trans_blocks(inode); needed_blocks = ext4_writepage_trans_blocks(inode);
handle = ext4_journal_start(inode, EXT4_HT_INODE, needed_blocks); handle = ext4_journal_start(inode, EXT4_HT_INODE, needed_blocks);
if (IS_ERR(handle)) if (IS_ERR(handle))
return; return PTR_ERR(handle);
ext4_write_lock_xattr(inode, &no_expand); ext4_write_lock_xattr(inode, &no_expand);
if (!ext4_has_inline_data(inode)) { if (!ext4_has_inline_data(inode)) {
*has_inline = 0; *has_inline = 0;
ext4_journal_stop(handle); ext4_journal_stop(handle);
return; return 0;
} }
if (ext4_orphan_add(handle, inode)) if ((err = ext4_orphan_add(handle, inode)) != 0)
goto out; goto out;
if (ext4_get_inode_loc(inode, &is.iloc)) if ((err = ext4_get_inode_loc(inode, &is.iloc)) != 0)
goto out; goto out;
down_write(&EXT4_I(inode)->i_data_sem); down_write(&EXT4_I(inode)->i_data_sem);
@ -1937,24 +1937,29 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
if (i_size < inline_size) { if (i_size < inline_size) {
/* Clear the content in the xattr space. */ /* Clear the content in the xattr space. */
if (inline_size > EXT4_MIN_INLINE_DATA_SIZE) { if (inline_size > EXT4_MIN_INLINE_DATA_SIZE) {
if (ext4_xattr_ibody_find(inode, &i, &is)) if ((err = ext4_xattr_ibody_find(inode, &i, &is)) != 0)
goto out_error; goto out_error;
BUG_ON(is.s.not_found); BUG_ON(is.s.not_found);
value_len = le32_to_cpu(is.s.here->e_value_size); value_len = le32_to_cpu(is.s.here->e_value_size);
value = kmalloc(value_len, GFP_NOFS); value = kmalloc(value_len, GFP_NOFS);
if (!value) if (!value) {
err = -ENOMEM;
goto out_error; goto out_error;
}
if (ext4_xattr_ibody_get(inode, i.name_index, i.name, err = ext4_xattr_ibody_get(inode, i.name_index,
value, value_len)) i.name, value, value_len);
if (err <= 0)
goto out_error; goto out_error;
i.value = value; i.value = value;
i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ? i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ?
i_size - EXT4_MIN_INLINE_DATA_SIZE : 0; i_size - EXT4_MIN_INLINE_DATA_SIZE : 0;
if (ext4_xattr_ibody_inline_set(handle, inode, &i, &is)) err = ext4_xattr_ibody_inline_set(handle, inode,
&i, &is);
if (err)
goto out_error; goto out_error;
} }
@ -1979,13 +1984,14 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
if (inode->i_nlink) if (inode->i_nlink)
ext4_orphan_del(handle, inode); ext4_orphan_del(handle, inode);
inode->i_mtime = inode->i_ctime = current_time(inode); if (err == 0) {
ext4_mark_inode_dirty(handle, inode); inode->i_mtime = inode->i_ctime = current_time(inode);
if (IS_SYNC(inode)) err = ext4_mark_inode_dirty(handle, inode);
ext4_handle_sync(handle); if (IS_SYNC(inode))
ext4_handle_sync(handle);
}
ext4_journal_stop(handle); ext4_journal_stop(handle);
return; return err;
} }
int ext4_convert_inline_data(struct inode *inode) int ext4_convert_inline_data(struct inode *inode)

4
fs/ext4/inode.c
View File

@ -4222,7 +4222,9 @@ int ext4_truncate(struct inode *inode)
if (ext4_has_inline_data(inode)) { if (ext4_has_inline_data(inode)) {
int has_inline = 1; int has_inline = 1;
ext4_inline_data_truncate(inode, &has_inline); err = ext4_inline_data_truncate(inode, &has_inline);
if (err)
return err;
if (has_inline) if (has_inline)
return 0; return 0;
} }