diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
| commit | 70f05366b71c51c35c25c0b76b4318fbc26c975a (patch) | |
| tree | d31230b93ba7df50d87eb11b1dba091641a9b89e /fs/nfs/dir.c | |
| parent | c0bc8721b8d0380ec69fa97578c91201201b05a9 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 3ddda6f7ecc..e7ffb4deb3e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -690,7 +690,9 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd) goto out_force; /* This is an open(2) */ if (nfs_lookup_check_intent(nd, LOOKUP_OPEN) != 0 && - !(server->flags & NFS_MOUNT_NOCTO)) + !(server->flags & NFS_MOUNT_NOCTO) && + (S_ISREG(inode->i_mode) || + S_ISDIR(inode->i_mode))) goto out_force; } return nfs_revalidate_inode(server, inode); |