diff options
| author | Tao Ma <boyu.mt@taobao.com> | 2012-12-10 14:06:03 -0500 | 
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-12-10 14:06:03 -0500 | 
| commit | 0c8d414f163f5d35e43a4de7a6e5ee8c253fcccf (patch) | |
| tree | 7db57d3b2926408bda5bad880896ee4ec384f398 /fs/ext4/inline.c | |
| parent | aef1c8513c1f8ae076e22ea2a57eff5835578e75 (diff) | |
| download | olio-linux-3.10-0c8d414f163f5d35e43a4de7a6e5ee8c253fcccf.tar.xz olio-linux-3.10-0c8d414f163f5d35e43a4de7a6e5ee8c253fcccf.zip  | |
ext4: let fallocate handle inline data correctly
If we are punching hole in a file, we will return ENOTSUPP.
As for the fallocation of some extents, we will convert the
inline data to a normal extent based file first.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/inline.c')
| -rw-r--r-- | fs/ext4/inline.c | 39 | 
1 files changed, 39 insertions, 0 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 727edb8d57e..53b2f65091d 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1843,3 +1843,42 @@ out:  	ext4_journal_stop(handle);  	return;  } + +int ext4_convert_inline_data(struct inode *inode) +{ +	int error, needed_blocks; +	handle_t *handle; +	struct ext4_iloc iloc; + +	if (!ext4_has_inline_data(inode)) { +		ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); +		return 0; +	} + +	needed_blocks = ext4_writepage_trans_blocks(inode); + +	iloc.bh = NULL; +	error = ext4_get_inode_loc(inode, &iloc); +	if (error) +		return error; + +	handle = ext4_journal_start(inode, needed_blocks); +	if (IS_ERR(handle)) { +		error = PTR_ERR(handle); +		goto out_free; +	} + +	down_write(&EXT4_I(inode)->xattr_sem); +	if (!ext4_has_inline_data(inode)) { +		up_write(&EXT4_I(inode)->xattr_sem); +		goto out; +	} + +	error = ext4_convert_inline_data_nolock(handle, inode, &iloc); +	up_write(&EXT4_I(inode)->xattr_sem); +out: +	ext4_journal_stop(handle); +out_free: +	brelse(iloc.bh); +	return error; +}  |