diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-08-01 13:40:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-01 15:10:01 -0700 |
| commit | 77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5 (patch) | |
| tree | f08c0c2dab44348919ec296254c3cc39d34e9f85 | |
| parent | a63ecd835f075b21d7d5cef9580447f5fbb36263 (diff) | |
| download | linux-77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5.tar.gz linux-77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5.tar.bz2 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>
| -rw-r--r-- | fs/nfs/write.c | 5 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 6 |
2 files changed, 6 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; diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index f6e2455f13d1..bad4d121b16e 100644 --- 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 |