On Mon 21-02-22 00:22:19, Edward Shishkin wrote:
> Signed-off-by: Edward Shishkin <edward.shishkin@xxxxxxxxx>
> ---
> fs/reiserfs/inode.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
Thanks! I have queued this patch into my tree.
Honza
>
> diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
> index f49b72ccac4c..e943930939f5 100644
> --- a/fs/reiserfs/inode.c
> +++ b/fs/reiserfs/inode.c
> @@ -2763,13 +2763,6 @@ static int reiserfs_write_begin(struct file *file,
> int old_ref = 0;
>
> inode = mapping->host;
> - *fsdata = NULL;
> - if (flags & AOP_FLAG_CONT_EXPAND &&
> - (pos & (inode->i_sb->s_blocksize - 1)) == 0) {
> - pos ++;
> - *fsdata = (void *)(unsigned long)flags;
> - }
> -
> index = pos >> PAGE_SHIFT;
> page = grab_cache_page_write_begin(mapping, index, flags);
> if (!page)
> @@ -2896,9 +2889,6 @@ static int reiserfs_write_end(struct file *file, struct address_space *mapping,
> unsigned start;
> bool locked = false;
>
> - if ((unsigned long)fsdata & AOP_FLAG_CONT_EXPAND)
> - pos ++;
> -
> reiserfs_wait_on_write_block(inode->i_sb);
> if (reiserfs_transaction_running(inode->i_sb))
> th = current->journal_info;
> @@ -3316,7 +3306,11 @@ int reiserfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
>
> /* fill in hole pointers in the expanding truncate case. */
> if (attr->ia_size > inode->i_size) {
> - error = generic_cont_expand_simple(inode, attr->ia_size);
> + loff_t pos = attr->ia_size;
> +
> + if ((pos & (inode->i_sb->s_blocksize - 1)) == 0)
> + pos++;
> + error = generic_cont_expand_simple(inode, pos);
> if (REISERFS_I(inode)->i_prealloc_count > 0) {
> int err;
> struct reiserfs_transaction_handle th;
> --
> 2.21.3
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
