diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2010-09-24 18:50:01 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-10-23 15:27:32 -0400 |
commit | 0715dc632a271fc0fedf3ef4779fe28ac1e53ef4 (patch) | |
tree | bbbb9fa7e47f478810ab0724fc687ec374978df1 /fs/nfs | |
parent | d39ab9de3b80da5835049b1c3b49da4e84e01c07 (diff) |
NFS: remove readdir plus limit
We will now use readdir plus even on directories that are very large.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/inode.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index f2d2c801e0af..6eec28656415 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -234,9 +234,6 @@ nfs_init_locked(struct inode *inode, void *opaque) | |||
234 | return 0; | 234 | return 0; |
235 | } | 235 | } |
236 | 236 | ||
237 | /* Don't use READDIRPLUS on directories that we believe are too large */ | ||
238 | #define NFS_LIMIT_READDIRPLUS (8*PAGE_SIZE) | ||
239 | |||
240 | /* | 237 | /* |
241 | * This is our front-end to iget that looks up inodes by file handle | 238 | * This is our front-end to iget that looks up inodes by file handle |
242 | * instead of inode number. | 239 | * instead of inode number. |
@@ -291,8 +288,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) | |||
291 | } else if (S_ISDIR(inode->i_mode)) { | 288 | } else if (S_ISDIR(inode->i_mode)) { |
292 | inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->dir_inode_ops; | 289 | inode->i_op = NFS_SB(sb)->nfs_client->rpc_ops->dir_inode_ops; |
293 | inode->i_fop = &nfs_dir_operations; | 290 | inode->i_fop = &nfs_dir_operations; |
294 | if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS) | 291 | if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS)) |
295 | && fattr->size <= NFS_LIMIT_READDIRPLUS) | ||
296 | set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags); | 292 | set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags); |
297 | /* Deal with crossing mountpoints */ | 293 | /* Deal with crossing mountpoints */ |
298 | if ((fattr->valid & NFS_ATTR_FATTR_FSID) | 294 | if ((fattr->valid & NFS_ATTR_FATTR_FSID) |