| From 336e2fc4e25301621b7c76a47491195f4a6bd22f Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@hammerspace.com> |
| Date: Sun, 29 Mar 2020 20:06:45 -0400 |
| Subject: [PATCH] NFS: Fix memory leaks in nfs_pageio_stop_mirroring() |
| |
| commit 862f35c94730c9270833f3ad05bd758a29f204ed upstream. |
| |
| 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 <trond.myklebust@hammerspace.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c |
| index fbdbe7db1192..64d87576a6c1 100644 |
| --- a/fs/nfs/pagelist.c |
| +++ b/fs/nfs/pagelist.c |
| @@ -888,15 +888,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; |
| @@ -1322,6 +1313,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", |
| -- |
| 2.7.4 |
| |
