Messages in this thread Patch in this message | | | Date | Sat, 2 Feb 2008 02:34:38 +0100 | From | "Oliver Pinter (Pintér Olivér)" <> | Subject | [2.6.22.y] {15/17} - nfs-unmount-leak.patch - series for stable kernel #2 |
| |
mainline: 13ef7b69b54aa8ae4ed264d0bf41339737f8543a
-- Thanks, Oliver From: Trond Myklebust <Trond.Myklebust@netapp.com> Date: Tue Dec 11 11:05:19 2007 -0500 Subject: NFSv2/v3: Fix a memory leak when using -onolock Patch-mainline: 2.6.24 References: 336253
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: Neil Brown <neilb@suse.de> Signed-off-by: Neil Brown <neilb@suse.de>
--- fs/nfs/client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- linux-2.6.22-SL103_BRANCH.orig/fs/nfs/client.c +++ linux-2.6.22-SL103_BRANCH/fs/nfs/client.c @@ -433,9 +433,6 @@ static int nfs_create_rpc_client(struct */ 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 */ } @@ -771,6 +768,9 @@ void nfs_free_server(struct nfs_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); | |