From: Andrew Morton fs/nfs/file.c: In function 'nfs_release_page': fs/nfs/file.c:353: error: void value not ignored as it ought to be Cc: David Howells Signed-off-by: Andrew Morton --- fs/nfs/fscache.h | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff -puN fs/nfs/fscache.h~nfs-use-local-caching-12-fix fs/nfs/fscache.h --- a/fs/nfs/fscache.h~nfs-use-local-caching-12-fix +++ a/fs/nfs/fscache.h @@ -442,19 +442,36 @@ static inline void nfs_fscache_release_f struct nfs_inode *nfsi) { } -static inline void nfs_fscache_zap_fh_cookie(struct nfs_server *server, struct nfs_inode *nfsi) {} -static inline void nfs_fscache_renew_fh_cookie(struct nfs_server *server, struct nfs_inode *nfsi) {} -static inline void nfs_fscache_disable_fh_cookie(struct inode *inode) {} -static inline void nfs_fscache_install_vm_ops(struct inode *inode, struct vm_area_struct *vma) {} -static inline void nfs_fscache_release_page(struct page *page) {} +static inline void nfs_fscache_zap_fh_cookie(struct nfs_server *server, + struct nfs_inode *nfsi) +{ +} +static inline void nfs_fscache_renew_fh_cookie(struct nfs_server *server, + struct nfs_inode *nfsi) +{ +} +static inline void nfs_fscache_disable_fh_cookie(struct inode *inode) +{ +} +static inline void nfs_fscache_install_vm_ops(struct inode *inode, + struct vm_area_struct *vma) +{ +} +static inline int nfs_fscache_release_page(struct page *page) +{ + return 1; /* True: may release page */ +} static inline void nfs_fscache_invalidate_page(struct page *page, struct inode *inode, unsigned long offset) { } -static inline void nfs_readpage_to_fscache(struct inode *inode, struct page *page, int sync) {} +static inline void nfs_readpage_to_fscache(struct inode *inode, + struct page *page, int sync) +{ +} static inline int nfs_readpage_from_fscache(struct nfs_open_context *ctx, - struct inode *inode, struct page *page) + struct inode *inode, struct page *page) { return -ENOBUFS; } @@ -467,7 +484,8 @@ static inline int nfs_readpages_from_fsc return -ENOBUFS; } -static inline void nfs_writepage_to_fscache(struct inode *inode, struct page *page) +static inline void nfs_writepage_to_fscache(struct inode *inode, + struct page *page) { BUG_ON(PageNfsCached(page)); } _