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

Commit b38f7532 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: Fix memory leaks in nfs_pageio_stop_mirroring() 



[ Upstream commit 862f35c94730c9270833f3ad05bd758a29f204ed ]

If we just set the mirror count to 1 without first clearing out
the mirrors, we can leak queued up requests.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 044a8840

fs/nfs/pagelist.c

+8 −9
Original line number Diff line number Diff line
@@ -865,15 +865,6 @@ static void nfs_pageio_setup_mirroring(struct nfs_pageio_descriptor *pgio, 
	pgio->pg_mirror_count = mirror_count;

}



/*

 * nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1)

 */

void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio)

{

	pgio->pg_mirror_count = 1;

	pgio->pg_mirror_idx = 0;

}



static void nfs_pageio_cleanup_mirroring(struct nfs_pageio_descriptor *pgio)

{

	pgio->pg_mirror_count = 1;
@@ -1302,6 +1293,14 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index) 
	}

}



/*

 * nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1)

 */

void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio)

{

	nfs_pageio_complete(pgio);

}



int __init nfs_init_nfspagecache(void)

{

	nfs_page_cachep = kmem_cache_create("nfs_page",