| From stable-bounces@linux.kernel.org Thu Sep 7 17:10:17 2006 |
| From: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Date: Thu, 07 Sep 2006 20:09:43 -0400 |
| To: stable@kernel.org |
| Message-Id: <20060908000943.10655.99673.stgit@lade.trondhjem.org> |
| Subject: NFS: More page cache revalidation fixups |
| |
| From: Trond Myklebust <Trond.Myklebust@netapp.com> |
| |
| Whenever the directory changes, we want to make sure that we always |
| invalidate its page cache. Fix up update_changeattr() and |
| nfs_mark_for_revalidate() so that they do so. |
| |
| Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| fs/nfs/nfs4proc.c | 10 +++++----- |
| include/linux/nfs_fs.h | 6 +++++- |
| 2 files changed, 10 insertions(+), 6 deletions(-) |
| |
| --- linux-2.6.17.13.orig/fs/nfs/nfs4proc.c |
| +++ linux-2.6.17.13/fs/nfs/nfs4proc.c |
| @@ -185,15 +185,15 @@ static void renew_lease(const struct nfs |
| spin_unlock(&clp->cl_lock); |
| } |
| |
| -static void update_changeattr(struct inode *inode, struct nfs4_change_info *cinfo) |
| +static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo) |
| { |
| - struct nfs_inode *nfsi = NFS_I(inode); |
| + struct nfs_inode *nfsi = NFS_I(dir); |
| |
| - spin_lock(&inode->i_lock); |
| - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; |
| + spin_lock(&dir->i_lock); |
| + nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA; |
| if (cinfo->before == nfsi->change_attr && cinfo->atomic) |
| nfsi->change_attr = cinfo->after; |
| - spin_unlock(&inode->i_lock); |
| + spin_unlock(&dir->i_lock); |
| } |
| |
| struct nfs4_opendata { |
| --- linux-2.6.17.13.orig/include/linux/nfs_fs.h |
| +++ linux-2.6.17.13/include/linux/nfs_fs.h |
| @@ -234,8 +234,12 @@ static inline int nfs_caches_unstable(st |
| |
| static inline void nfs_mark_for_revalidate(struct inode *inode) |
| { |
| + struct nfs_inode *nfsi = NFS_I(inode); |
| + |
| spin_lock(&inode->i_lock); |
| - NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS; |
| + nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS; |
| + if (S_ISDIR(inode->i_mode)) |
| + nfsi->cache_validity |= NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA; |
| spin_unlock(&inode->i_lock); |
| } |
| |