|
@@ -192,7 +192,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
|
|
|
/* We requested READDIRPLUS, but the server doesn't grok it */
|
|
|
if (error == -ENOTSUPP && desc->plus) {
|
|
|
NFS_SERVER(inode)->caps &= ~NFS_CAP_READDIRPLUS;
|
|
|
- clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));
|
|
|
+ clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
|
|
|
desc->plus = 0;
|
|
|
goto again;
|
|
|
}
|
|
@@ -577,7 +577,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|
|
break;
|
|
|
}
|
|
|
if (res == -ETOOSMALL && desc->plus) {
|
|
|
- clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_FLAGS(inode));
|
|
|
+ clear_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
|
|
|
nfs_zap_caches(inode);
|
|
|
desc->plus = 0;
|
|
|
desc->entry->eof = 0;
|
|
@@ -1760,7 +1760,7 @@ static void __nfs_access_zap_cache(struct inode *inode)
|
|
|
void nfs_access_zap_cache(struct inode *inode)
|
|
|
{
|
|
|
/* Remove from global LRU init */
|
|
|
- if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) {
|
|
|
+ if (test_and_clear_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {
|
|
|
spin_lock(&nfs_access_lru_lock);
|
|
|
list_del_init(&NFS_I(inode)->access_cache_inode_lru);
|
|
|
spin_unlock(&nfs_access_lru_lock);
|
|
@@ -1874,7 +1874,7 @@ static void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *s
|
|
|
smp_mb__after_atomic_inc();
|
|
|
|
|
|
/* Add inode to global LRU list */
|
|
|
- if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_FLAGS(inode))) {
|
|
|
+ if (!test_and_set_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {
|
|
|
spin_lock(&nfs_access_lru_lock);
|
|
|
list_add_tail(&NFS_I(inode)->access_cache_inode_lru, &nfs_access_lru_list);
|
|
|
spin_unlock(&nfs_access_lru_lock);
|