aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 72d141a0dbd8..c578d942f000 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -192,7 +192,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
192 /* We requested READDIRPLUS, but the server doesn't grok it */ 192 /* We requested READDIRPLUS, but the server doesn't grok it */
193 if (error == -ENOTSUPP && desc->plus) { 193 if (error == -ENOTSUPP && desc->plus) {
194 NFS_SERVER(inode)->caps &= ~NFS_CAP_READDIRPLUS; 194 NFS_SERVER(inode)->caps &= ~NFS_CAP_READDIRPLUS;
195 clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode)); 195 clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
196 desc->plus = 0; 196 desc->plus = 0;
197 goto again; 197 goto again;
198 } 198 }
@@ -577,7 +577,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
577 break; 577 break;
578 } 578 }
579 if (res == -ETOOSMALL && desc->plus) { 579 if (res == -ETOOSMALL && desc->plus) {
580 clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode)); 580 clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
581 nfs_zap_caches(inode); 581 nfs_zap_caches(inode);
582 desc->plus = 0; 582 desc->plus = 0;
583 desc->entry->eof = 0; 583 desc->entry->eof = 0;
@@ -1760,7 +1760,7 @@ static void __nfs_access_zap_cache(struct inode *inode)
1760void nfs_access_zap_cache(struct inode *inode) 1760void nfs_access_zap_cache(struct inode *inode)
1761{ 1761{
1762 /* Remove from global LRU init */ 1762 /* Remove from global LRU init */
1763 if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) { 1763 if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {
1764 spin_lock(&nfs_access_lru_lock); 1764 spin_lock(&nfs_access_lru_lock);
1765 list_del_init(&NFS_I(inode)->access_cache_inode_lru); 1765 list_del_init(&NFS_I(inode)->access_cache_inode_lru);
1766 spin_unlock(&nfs_access_lru_lock); 1766 spin_unlock(&nfs_access_lru_lock);
@@ -1874,7 +1874,7 @@ static void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *s
1874 smp_mb__after_atomic_inc(); 1874 smp_mb__after_atomic_inc();
1875 1875
1876 /* Add inode to global LRU list */ 1876 /* Add inode to global LRU list */
1877 if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) { 1877 if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {
1878 spin_lock(&nfs_access_lru_lock); 1878 spin_lock(&nfs_access_lru_lock);
1879 list_add_tail(&NFS_I(inode)->access_cache_inode_lru, &nfs_access_lru_list); 1879 list_add_tail(&NFS_I(inode)->access_cache_inode_lru, &nfs_access_lru_list);
1880 spin_unlock(&nfs_access_lru_lock); 1880 spin_unlock(&nfs_access_lru_lock);