summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-08-01 19:40:40 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-02 00:10:01 +0200
commit77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5 (patch)
treef08c0c2dab44348919ec296254c3cc39d34e9f85 /fs
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5.tar.xz
linux-77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5.zip
NFS: Fix a typo in include/linux/nfs_fs.h
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 <mingo@elte.hu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/write.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index bb72ad34d51d..9f81bdd91c55 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1454,11 +1454,6 @@ out_mark_dirty:
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;