NFS: Fix a typo in include/linux/nfs_fs.h

Trond Myklebust · torvalds · commit 77a63f3d1e0a · 2010-08-01T15:10:01.000-07:00
nfs_commit_inode() needs to be defined irrespectively of whether or not
we are supporting NFSv3 and NFSv4.

Allow the compiler to optimise away code in the NFSv2-only case by
converting it into an inlined stub function.

Reported-and-tested-by: Ingo Molnar &lt;mingo@elte.hu&gt;
Signed-off-by: Trond Myklebust &lt;Trond.Myklebust@netapp.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/fs/nfs/write.c b/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/include/linux/nfs_fs.h b/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

Original file line number	Diff line number	Diff line change
`@@ -1454,11 +1454,6 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr`
`1454`	`1454`	`return ret;`
`1455`	`1455`	`}`
`1456`	`1456`	`#else`
`1457`		`-int nfs_commit_inode(struct inode *inode, int how)`
`1458`		`-{`
`1459`		`- return 0;`
`1460`		`-}`
`1461`		`-`
`1462`	`1457`	`static int nfs_commit_unstable_pages(struct inode inode, struct writeback_control wbc)`
`1463`	`1458`	`{`
`1464`	`1459`	`return 0;`