On Fri, 2008-03-07 at 16:23 +0530, Aneesh Kumar K.V wrote:
> ext4_fallocate need to update file size in each transaction. Otherwise
> ife we crash the file size won't be updated. We were also not marking
> the inode dirty after updating file size before. Also when we try to
> retry allocation due to ENOSPC make sure we reset the variable ret so
> that we actually do a retry.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
> ---
> fs/ext4/extents.c | 78 +++++++++++++++++++++--------------------------------
> 1 files changed, 31 insertions(+), 47 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index dcdf92a..09dd3c5 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -2783,6 +2783,26 @@ int ext4_ext_writepage_trans_blocks(struct inode *inode, int num)
> return needed;
> }
>
> +static void ext4_falloc_update_inode(struct inode *inode,
> + int mode, loff_t new_size)
> +{
> + struct timespec now;
> +
> + now = current_fs_time(inode->i_sb);
> + if (!timespec_equal(&inode->i_ctime, &now))
> + inode->i_ctime = now;
> + /*
> + * Update only when preallocation was requested beyond
> + * the file size.
> + */
> + if (!(mode & FALLOC_FL_KEEP_SIZE) &&
> + new_size > i_size_read(inode)) {
> + i_size_write(inode, new_size);
> + EXT4_I(inode)->i_disksize = i_size_read(inode);
Just a minor thing, we could store new_size directly to i_disksize to
avoid calling the i_size_read() instead.
> + }
> +
> +}
> +
> /*
> * preallocate space for a file. This implements ext4's fallocate inode
> * operation, which gets called from sys_fallocate system call.
> @@ -2794,8 +2814,8 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len)
> {
> handle_t *handle;
> ext4_lblk_t block;
> + loff_t new_size;
> unsigned long max_blocks;
> - ext4_fsblk_t nblocks = 0;
> int ret = 0;
> int ret2 = 0;
> int retries = 0;
> @@ -2814,8 +2834,7 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len)
> return -ENODEV;
>
> block = offset >> blkbits;
> - max_blocks = (EXT4_BLOCK_ALIGN(len + offset, blkbits) >> blkbits)
> - - block;
> + max_blocks = EXT4_BLOCK_ALIGN(len, blkbits) >> blkbits;
>
Not sure about this change... Other than this looks fine to me
MIngming
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
