From: Andrew Morton <akpm@osdl.org>

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/nfs/write.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN fs/nfs/write.c~nfs-fix-congestion-control-v4-tweaks fs/nfs/write.c
--- a/fs/nfs/write.c~nfs-fix-congestion-control-v4-tweaks
+++ a/fs/nfs/write.c
@@ -79,7 +79,6 @@ static struct nfs_page * nfs_update_requ
 					    struct page *,
 					    unsigned int, unsigned int);
 static void nfs_mark_request_dirty(struct nfs_page *req);
-static int nfs_wait_on_write_congestion(struct address_space *);
 static int nfs_wait_on_requests(struct inode *, unsigned long, unsigned int);
 static long nfs_flush_mapping(struct address_space *mapping, struct writeback_control *wbc, int how);
 static const struct rpc_call_ops nfs_write_partial_ops;
@@ -253,18 +252,19 @@ int nfs_congestion_kb;
 #define NFS_CONGESTION_OFF_THRESH	\
 	(NFS_CONGESTION_ON_THRESH - (NFS_CONGESTION_ON_THRESH >> 2))
 
-static inline void nfs_set_page_writeback(struct page *page)
+static void nfs_set_page_writeback(struct page *page)
 {
 	if (!test_set_page_writeback(page)) {
 		struct inode *inode = page->mapping->host;
 		struct nfs_server *nfss = NFS_SERVER(inode);
 
-		if (atomic_inc_return(&nfss->writeback) > NFS_CONGESTION_ON_THRESH)
+		if (atomic_inc_return(&nfss->writeback) >
+				NFS_CONGESTION_ON_THRESH)
 			set_bdi_congested(&nfss->backing_dev_info, WRITE);
 	}
 }
 
-static inline void nfs_end_page_writeback(struct page *page)
+static void nfs_end_page_writeback(struct page *page)
 {
 	struct inode *inode = page->mapping->host;
 	struct nfs_server *nfss = NFS_SERVER(inode);
_