From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 3/4] NFS: Fix up filesystem caching patch Date: Mon, 21 Aug 2006 13:50:27 +0100 Message-ID: <20060821125027.1437.95895.stgit@warthog.cambridge.redhat.com> References: <20060821125022.1437.2836.stgit@warthog.cambridge.redhat.com> Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: 8bit Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com Return-path: Received: from mx1.redhat.com ([66.187.233.31]:2283 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S932092AbWHUMvn (ORCPT ); Mon, 21 Aug 2006 08:51:43 -0400 To: akpm@osdl.org, trond.myklebust@fys.uio.no, michal.k.k.piotrowski@gmail.com, maciej.rutecki@gmail.com, bunk@stusta.de In-Reply-To: <20060821125022.1437.2836.stgit@warthog.cambridge.redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Fix up the NFS filesystem caching patch for when caching is disabled. Signed-Off-By: David Howells --- fs/nfs/fscache.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h index 48a993a..8899f16 100644 --- a/fs/nfs/fscache.h +++ b/fs/nfs/fscache.h @@ -446,7 +446,10 @@ static inline void nfs_fscache_zap_fh_co 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 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)