NFS: Fix memory leaks in nfs_pageio_stop_mirroring()

Trond Myklebust · Trond Myklebust · commit 862f35c94730 · 2020-04-01T13:37:56.000-04:00
If we just set the mirror count to 1 without first clearing out
the mirrors, we can leak queued up requests.

Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
@@ -900,15 +900,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;
@@ -1334,6 +1325,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",

Original file line number	Diff line number	Diff line change
`@@ -900,15 +900,6 @@ static void nfs_pageio_setup_mirroring(struct nfs_pageio_descriptor *pgio,`
`900`	`900`	`pgio->pg_mirror_count = mirror_count;`
`901`	`901`	`}`
`902`	`902`
`903`		`-/*`
`904`		`- * nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1)`
`905`		`- */`
`906`		`-void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio)`
`907`		`-{`
`908`		`- pgio->pg_mirror_count = 1;`
`909`		`- pgio->pg_mirror_idx = 0;`
`910`		`-}`
`911`		`-`
`912`	`903`	`static void nfs_pageio_cleanup_mirroring(struct nfs_pageio_descriptor *pgio)`
`913`	`904`	`{`
`914`	`905`	`pgio->pg_mirror_count = 1;`
`@@ -1334,6 +1325,14 @@ void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *desc, pgoff_t index)`
`1334`	`1325`	`}`
`1335`	`1326`	`}`
`1336`	`1327`
	`1328`	`+/*`
	`1329`	`+ * nfs_pageio_stop_mirroring - stop using mirroring (set mirror count to 1)`
	`1330`	`+ */`
	`1331`	`+void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio)`
	`1332`	`+{`
	`1333`	`+ nfs_pageio_complete(pgio);`
	`1334`	`+}`
	`1335`	`+`
`1337`	`1336`	`int __init nfs_init_nfspagecache(void)`
`1338`	`1337`	`{`
`1339`	`1338`	`nfs_page_cachep = kmem_cache_create("nfs_page",`