On Mon 13-06-22 07:37:10, Christoph Hellwig wrote:
> Handle the resident case with an explicit generic_writepages call instead
> of using the obscure overload that makes mpage_writepages with a NULL
> get_block do the same thing.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Yeah, much more obvious :). Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/ntfs3/inode.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
> index be4ebdd8048b0..28c09c25b823d 100644
> --- a/fs/ntfs3/inode.c
> +++ b/fs/ntfs3/inode.c
> @@ -851,12 +851,10 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc)
> static int ntfs_writepages(struct address_space *mapping,
> struct writeback_control *wbc)
> {
> - struct inode *inode = mapping->host;
> - struct ntfs_inode *ni = ntfs_i(inode);
> /* Redirect call to 'ntfs_writepage' for resident files. */
> - get_block_t *get_block = is_resident(ni) ? NULL : &ntfs_get_block;
> -
> - return mpage_writepages(mapping, wbc, get_block);
> + if (is_resident(ntfs_i(mapping->host)))
> + return generic_writepages(mapping, wbc);
> + return mpage_writepages(mapping, wbc, ntfs_get_block);
> }
>
> static int ntfs_get_block_write_begin(struct inode *inode, sector_t vbn,
> --
> 2.30.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
