Commit d4428bad authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton

ntfs3: stop using generic_writepages

Open code the resident inode handling in ntfs_writepages by directly using
write_cache_pages to prepare removing the ->writepage handler in ntfs3.

Link: https://lkml.kernel.org/r/20221229161031.391878-3-hch@lst.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5b68de67
...@@ -852,12 +852,29 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc) ...@@ -852,12 +852,29 @@ static int ntfs_writepage(struct page *page, struct writeback_control *wbc)
return block_write_full_page(page, ntfs_get_block, wbc); return block_write_full_page(page, ntfs_get_block, wbc);
} }
static int ntfs_resident_writepage(struct page *page,
struct writeback_control *wbc, void *data)
{
struct address_space *mapping = data;
struct ntfs_inode *ni = ntfs_i(mapping->host);
int ret;
ni_lock(ni);
ret = attr_data_write_resident(ni, page);
ni_unlock(ni);
if (ret != E_NTFS_NONRESIDENT)
unlock_page(page);
mapping_set_error(mapping, ret);
return ret;
}
static int ntfs_writepages(struct address_space *mapping, static int ntfs_writepages(struct address_space *mapping,
struct writeback_control *wbc) struct writeback_control *wbc)
{ {
/* Redirect call to 'ntfs_writepage' for resident files. */
if (is_resident(ntfs_i(mapping->host))) if (is_resident(ntfs_i(mapping->host)))
return generic_writepages(mapping, wbc); return write_cache_pages(mapping, wbc, ntfs_resident_writepage,
mapping);
return mpage_writepages(mapping, wbc, ntfs_get_block); return mpage_writepages(mapping, wbc, ntfs_get_block);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment