diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-01 14:17:06 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-02 09:58:00 -0500 |
| commit | 11de3b11e08cac26d59e88efaf4e316701883552 (patch) | |
| tree | e4cc282e692560897c42c5fbc8df227d5da669d4 /fs/nfs/inode.c | |
| parent | 6072d13c429373c5d63b69dadbbef40a9b035552 (diff) | |
| download | linux-3.10-11de3b11e08cac26d59e88efaf4e316701883552.tar.gz linux-3.10-11de3b11e08cac26d59e88efaf4e316701883552.tar.bz2 linux-3.10-11de3b11e08cac26d59e88efaf4e316701883552.zip | |
NFS: Fix a memory leak in nfs_readdir
We need to ensure that the entries in the nfs_cache_array get cleared
when the page is removed from the page cache. To do so, we use the
freepage address_space operation.
Change nfs_readdir_clear_array to use kmap_atomic(), so that the
function can be safely called from all contexts.
Finally, modify the cache_page_release helper to call
nfs_readdir_clear_array directly, when dealing with an anonymous
page from 'uncached_readdir'.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 314f5716460..e67e31c7341 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -289,6 +289,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; + inode->i_data.a_ops = &nfs_dir_aops; if (nfs_server_capable(inode, NFS_CAP_READDIRPLUS)) set_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags); /* Deal with crossing mountpoints */ |