[PATCH 16/16] Fix compiling NFS when backporting writeback

Stefan Bader stefan.bader at canonical.com
Tue Aug 10 09:29:04 UTC 2010


BugLink: http://bugs.launchpad.net/bugs/585092

These changes were part of the following upstream commits:

  commit 7f2f12d963e7c33a93bfb0b22f0178eb1e6a4196
  Author: Trond Myklebust <Trond.Myklebust at netapp.com>
  Date:   Fri Feb 19 17:03:28 2010 -0800

      NFS: Simplify nfs_wb_page()

  commit acdc53b2146c7ee67feb1f02f7bc3020126514b8
  Author: Trond Myklebust <Trond.Myklebust at netapp.com>
  Date:   Fri Feb 19 17:03:26 2010 -0800

      NFS: Replace __nfs_write_mapping with sync_inode()

As the changes above do some larger modifications on NFS, I am not sure
those should be part of the writeback backport.

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 fs/nfs/write.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index cf6c06f..4e9ce16 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1485,7 +1485,6 @@ out:
 static int nfs_write_mapping(struct address_space *mapping, int how)
 {
 	struct writeback_control wbc = {
-		.bdi = mapping->backing_dev_info,
 		.sync_mode = WB_SYNC_ALL,
 		.nr_to_write = LONG_MAX,
 		.range_start = 0,
@@ -1514,7 +1513,6 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page)
 	loff_t range_start = page_offset(page);
 	loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1);
 	struct writeback_control wbc = {
-		.bdi = page->mapping->backing_dev_info,
 		.sync_mode = WB_SYNC_ALL,
 		.nr_to_write = LONG_MAX,
 		.range_start = range_start,
@@ -1559,7 +1557,6 @@ static int nfs_wb_page_priority(struct inode *inode, struct page *page,
 	loff_t range_start = page_offset(page);
 	loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1);
 	struct writeback_control wbc = {
-		.bdi = page->mapping->backing_dev_info,
 		.sync_mode = WB_SYNC_ALL,
 		.nr_to_write = LONG_MAX,
 		.range_start = range_start,
-- 
1.7.0.4





More information about the kernel-team mailing list