From patchwork Tue Aug 10 09:29:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 61365 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 643BFB7104 for ; Tue, 10 Aug 2010 19:29:45 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Oil9Q-0005Yg-BI; Tue, 10 Aug 2010 10:29:40 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Oil94-0005DK-UM for kernel-team@lists.ubuntu.com; Tue, 10 Aug 2010 10:29:19 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Oil94-0001Hh-ST; Tue, 10 Aug 2010 10:29:18 +0100 Received: from p5b2e54bf.dip.t-dialin.net ([91.46.84.191] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Oil94-00053p-Mf; Tue, 10 Aug 2010 10:29:18 +0100 From: Stefan Bader To: kernel-team@lists.ubuntu.com, stable@kernel.org Subject: [PATCH 16/16] Fix compiling NFS when backporting writeback Date: Tue, 10 Aug 2010 11:29:04 +0200 Message-Id: <1281432544-20831-17-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281432544-20831-1-git-send-email-stefan.bader@canonical.com> References: <1281432544-20831-1-git-send-email-stefan.bader@canonical.com> Cc: axboe@kernel.dk X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/585092 These changes were part of the following upstream commits: commit 7f2f12d963e7c33a93bfb0b22f0178eb1e6a4196 Author: Trond Myklebust Date: Fri Feb 19 17:03:28 2010 -0800 NFS: Simplify nfs_wb_page() commit acdc53b2146c7ee67feb1f02f7bc3020126514b8 Author: Trond Myklebust 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 --- 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,