diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-12-11 22:01:56 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-12-11 22:01:56 -0500 |
| commit | 5cef338b30c110daf547fb13d99f0c77f2a79fbc (patch) | |
| tree | 4608bf1961dfb3f2f50d72d1b3c7a82daf031933 | |
| parent | 4584f520e1f773082ef44ff4f8969a5d992b16ec (diff) | |
| download | linux-rpi-5cef338b30c110daf547fb13d99f0c77f2a79fbc.tar.gz linux-rpi-5cef338b30c110daf547fb13d99f0c77f2a79fbc.tar.bz2 linux-rpi-5cef338b30c110daf547fb13d99f0c77f2a79fbc.zip | |
NFSv2/v3: Fix a memory leak when using -onolock
Neil Brown said:
> Hi Trond,
>
> We found that a machine which made moderately heavy use of
> 'automount' was leaking some nfs data structures - particularly the
> 4K allocated by rpc_alloc_iostats.
> It turns out that this only happens with filesystems with -onolock
> set.
> The problem is that if NFS_MOUNT_NONLM is set, nfs_start_lockd doesn't
> set server->destroy, so when the filesystem is unmounted, the
> ->client_acl is not shutdown, and so several resources are still
> held. Multiple mount/umount cycles will slowly eat away memory
> several pages at a time.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | fs/nfs/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 70587f383f10..a6f625497612 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -410,9 +410,6 @@ static int nfs_create_rpc_client(struct nfs_client *clp, int proto, */ static void nfs_destroy_server(struct nfs_server *server) { - if (!IS_ERR(server->client_acl)) - rpc_shutdown_client(server->client_acl); - if (!(server->flags & NFS_MOUNT_NONLM)) lockd_down(); /* release rpc.lockd */ } @@ -755,6 +752,9 @@ void nfs_free_server(struct nfs_server *server) if (server->destroy != NULL) server->destroy(server); + + if (!IS_ERR(server->client_acl)) + rpc_shutdown_client(server->client_acl); if (!IS_ERR(server->client)) rpc_shutdown_client(server->client); |