NFS: Fix a typo in include/linux/nfs_fs.h (77a63f3d) · Commits · 戴 / test

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>

fs/nfs/write.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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;

include/linux/nfs_fs.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message