---

yaml --- r: 201391 b: refs/heads/master c: 77a63f3 h: refs/heads/master i: 201389: ddf2e1c 201387: cb89df1 201383: a6b9d3d 201375: ebe3248 v: v3
git-mirror · Aug 1, 2010 · e00343e · e00343e
1 parent 7c93331
commit e00343e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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