Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217071
b: refs/heads/master
c: 0715dc6
h: refs/heads/master
i:
  217069: fe48124
  217067: 74e7003
  217063: 0d6e611
  217055: ac60699
v: v3
  • Loading branch information
Bryan Schumaker authored and Trond Myklebust committed Oct 23, 2010
1 parent 0ed55f2 commit 95ef4f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d39ab9de3b80da5835049b1c3b49da4e84e01c07
refs/heads/master: 0715dc632a271fc0fedf3ef4779fe28ac1e53ef4
6 changes: 1 addition & 5 deletions trunk/fs/nfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ nfs_init_locked(struct inode *inode, void *opaque)
return 0;
}

/* Don't use READDIRPLUS on directories that we believe are too large */
#define NFS_LIMIT_READDIRPLUS (8*PAGE_SIZE)

/*
* This is our front-end to iget that looks up inodes by file handle
* instead of inode number.
Expand Down Expand Up @@ -291,8 +288,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
} else if (S_ISDIR(inode->i_mode)) {
inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->dir_inode_ops;
inode->i_fop = &nfs_dir_operations;
if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS)
&& fattr->size <= NFS_LIMIT_READDIRPLUS)
if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS))
set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
/* Deal with crossing mountpoints */
if ((fattr->valid & NFS_ATTR_FATTR_FSID)
Expand Down

0 comments on commit 95ef4f9

Please sign in to comment.