Merge tag 'folio-6.0' of git://git.infradead.org/users/willy/pagecache

[linux-2.6-microblaze.git] / fs / ntfs3 / inode.c

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index d100a06..80104af 100644 (file)
--- 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,