diff options
author | Kinglong Mee <kinglongmee@gmail.com> | 2015-09-20 11:03:28 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-09-20 13:46:45 -0400 |
commit | 6f29b9bba7b08c6b1d6f2cc4cf750b342fc1946c (patch) | |
tree | 456b0c4c3395ba6701298a4fa6dcbe8bc7d0ec08 | |
parent | 4b0ab51db32eba0f48b7618254742f143364a28d (diff) |
NFS: Do cleanup before resetting pageio read/write to mds
There is a reference leak of layout segment after resetting
pageio read/write to mds.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r-- | fs/nfs/read.c | 3 | ||||
-rw-r--r-- | fs/nfs/write.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index ae0ff7a11b40..01b8cc8e8cfc 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -72,6 +72,9 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio) | |||
72 | { | 72 | { |
73 | struct nfs_pgio_mirror *mirror; | 73 | struct nfs_pgio_mirror *mirror; |
74 | 74 | ||
75 | if (pgio->pg_ops && pgio->pg_ops->pg_cleanup) | ||
76 | pgio->pg_ops->pg_cleanup(pgio); | ||
77 | |||
75 | pgio->pg_ops = &nfs_pgio_rw_ops; | 78 | pgio->pg_ops = &nfs_pgio_rw_ops; |
76 | 79 | ||
77 | /* read path should never have more than one mirror */ | 80 | /* read path should never have more than one mirror */ |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 388f48079c43..72624dc4a623 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1351,6 +1351,9 @@ void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio) | |||
1351 | { | 1351 | { |
1352 | struct nfs_pgio_mirror *mirror; | 1352 | struct nfs_pgio_mirror *mirror; |
1353 | 1353 | ||
1354 | if (pgio->pg_ops && pgio->pg_ops->pg_cleanup) | ||
1355 | pgio->pg_ops->pg_cleanup(pgio); | ||
1356 | |||
1354 | pgio->pg_ops = &nfs_pgio_rw_ops; | 1357 | pgio->pg_ops = &nfs_pgio_rw_ops; |
1355 | 1358 | ||
1356 | nfs_pageio_stop_mirroring(pgio); | 1359 | nfs_pageio_stop_mirroring(pgio); |