From e00343e7a4092615610ba5dc9dce537e7d5e8da1 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 1 Aug 2010 13:40:40 -0400
Subject: [PATCH] --- yaml --- r: 201391 b: refs/heads/master c:
 77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5 h: refs/heads/master i:   201389:
 ddf2e1cc4123161fa8b647e042cc7ae6f9a9b7a6   201387:
 cb89df199fb22e64ae4cf29c36099bd3439fdbfa   201383:
 a6b9d3d6cec745f72a77a72ce87a6092b217caca   201375:
 ebe3248425283c41e615061c0afe907dfc0cb280 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfs/write.c         | 5 -----
 trunk/include/linux/nfs_fs.h | 6 ++++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f0402f126ab3..9ed285b0e945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a63ecd835f075b21d7d5cef9580447f5fbb36263
+refs/heads/master: 77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index bb72ad34d51d..9f81bdd91c55 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -1454,11 +1454,6 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr
 	return ret;
 }
 #else
-int nfs_commit_inode(struct inode *inode, int how)
-{
-	return 0;
-}
-
 static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_control *wbc)
 {
 	return 0;
diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index f6e2455f13d1..bad4d121b16e 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/include/linux/nfs_fs.h
@@ -496,6 +496,12 @@ extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
 extern int  nfs_commit_inode(struct inode *, int);
 extern struct nfs_write_data *nfs_commitdata_alloc(void);
 extern void nfs_commit_free(struct nfs_write_data *wdata);
+#else
+static inline int
+nfs_commit_inode(struct inode *inode, int how)
+{
+	return 0;
+}
 #endif
 
 static inline int