diff options
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 3c7f03b669fb..c6f2750648f4 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
| @@ -560,7 +560,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
| 560 | desc->entry = &my_entry; | 560 | desc->entry = &my_entry; | 
| 561 | 561 | ||
| 562 | nfs_block_sillyrename(dentry); | 562 | nfs_block_sillyrename(dentry); | 
| 563 | res = nfs_revalidate_mapping_nolock(inode, filp->f_mapping); | 563 | res = nfs_revalidate_mapping(inode, filp->f_mapping); | 
| 564 | if (res < 0) | 564 | if (res < 0) | 
| 565 | goto out; | 565 | goto out; | 
| 566 | 566 | ||
| @@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str | |||
| 1789 | cache = nfs_access_search_rbtree(inode, cred); | 1789 | cache = nfs_access_search_rbtree(inode, cred); | 
| 1790 | if (cache == NULL) | 1790 | if (cache == NULL) | 
| 1791 | goto out; | 1791 | goto out; | 
| 1792 | if (!nfs_have_delegation(inode, FMODE_READ) && | 1792 | if (!nfs_have_delegated_attributes(inode) && | 
| 1793 | !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo)) | 1793 | !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo)) | 
| 1794 | goto out_stale; | 1794 | goto out_stale; | 
| 1795 | res->jiffies = cache->jiffies; | 1795 | res->jiffies = cache->jiffies; | 
