diff options
| author | Trond Myklebust <trond.myklebust@fys.uio.no> | 2005-10-17 12:02:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-17 23:47:16 +0200 |
| commit | b3c52da33ce95747b1bff86cce716d4f1397f14a (patch) | |
| tree | 7958a929e5b9486bf0b5358776078c1bc71faf88 /fs/nfs/delegation.c | |
| parent | [PATCH] USB: fix bug in handling of highspeed usb HID devices (diff) | |
| download | linux-b3c52da33ce95747b1bff86cce716d4f1397f14a.tar.xz linux-b3c52da33ce95747b1bff86cce716d4f1397f14a.zip | |
[PATCH] NFS: Fix cache consistency races
If the data cache has been marked as potentially invalid by nfs_refresh_inode,
we should invalidate it rather than assume that changes are due to our own
activity.
Also ensure that we always start with a valid cache before declaring it
to be protected by a delegation.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index d7f7eb669d03..4a36839f0bbd 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -85,6 +85,10 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct struct nfs_delegation *delegation; int status = 0; + /* Ensure we first revalidate the attributes and page cache! */ + if ((nfsi->cache_validity & (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_ATTR))) + __nfs_revalidate_inode(NFS_SERVER(inode), inode); + delegation = nfs_alloc_delegation(); if (delegation == NULL) return -ENOMEM; |