From 95ef4f92ee7f7bb08a09b489428744289cf1ab4a Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Fri, 24 Sep 2010 18:50:01 -0400 Subject: [PATCH] --- yaml --- r: 217071 b: refs/heads/master c: 0715dc632a271fc0fedf3ef4779fe28ac1e53ef4 h: refs/heads/master i: 217069: fe481246da499ecc57e1297d2b066ea71a2e174f 217067: 74e7003b22bf3e95a10cdf52d008a42510864055 217063: 0d6e6111166c5f4cac7084e6f62958497c39efbd 217055: ac60699618160dba7dd53bdc34ae423884ef9150 v: v3 --- [refs] | 2 +- trunk/fs/nfs/inode.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 644690679483..36bc8d2c1ab1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d39ab9de3b80da5835049b1c3b49da4e84e01c07 +refs/heads/master: 0715dc632a271fc0fedf3ef4779fe28ac1e53ef4 diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index f2d2c801e0af..6eec28656415 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/fs/nfs/inode.c @@ -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. @@ -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)