Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cef338b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: default avatarNeilBrown <neilb@suse.de>
parent 4584f520

fs/nfs/client.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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)

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))

	if (!(server->flags & NFS_MOUNT_NONLM))

		lockd_down();	/* release rpc.lockd */

		lockd_down();	/* release rpc.lockd */

}

}
@@ -755,6 +752,9 @@ void nfs_free_server(struct nfs_server *server) 




	if (server->destroy != NULL)

	if (server->destroy != NULL)

		server->destroy(server);

		server->destroy(server);



	if (!IS_ERR(server->client_acl))

		rpc_shutdown_client(server->client_acl);

	if (!IS_ERR(server->client))

	if (!IS_ERR(server->client))

		rpc_shutdown_client(server->client);

		rpc_shutdown_client(server->client);