--- fs/nfs/dir.c

+++ fs/nfs/dir.c

@@ -837,6 +837,8 @@ out_zap_parent:

/* If we have submounts, don't unhash ! */

if (have_submounts(dentry))

goto out_valid;

+ if (dentry->d_flags & DCACHE_DISCONNECTED)

+ goto out_valid;

shrink_dcache_parent(dentry);

}

d_drop(dentry);

@@ -1025,12 +1027,12 @@ static struct dentry *nfs_atomic_lookup(

res = NULL;

goto out;

/* This turned out not to be a regular file */

+ case -EISDIR:

case -ENOTDIR:

goto no_open;

case -ELOOP:

if (!(nd->intent.open.flags & O_NOFOLLOW))

goto no_open;

- /* case -EISDIR: */

/* case -EINVAL: */

default:

goto out;

@@ -1797,7 +1799,7 @@ static int nfs_access_get_cached(struct

cache = nfs_access_search_rbtree(inode, cred);

if (cache == NULL)

goto out;

- if (!nfs_have_delegation(inode, FMODE_READ) &&

+ if (!nfs_have_delegated_attributes(inode) &&

!time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))

goto out_stale;

res->jiffies = cache->jiffies;