diff options
author | Ingo Molnar | 2015-09-30 09:29:27 +0200 |
---|---|---|
committer | Ingo Molnar | 2015-09-30 09:29:27 +0200 |
commit | ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc (patch) | |
tree | e9b0f1a4c2f324c6fb107e276b09894ae480baa6 /fs/nfs/read.c | |
parent | x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case (diff) | |
parent | Linux 4.3-rc3 (diff) | |
download | kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.tar.gz kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.tar.xz kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.zip |
Merge tag 'v4.3-rc3' into x86/urgent, before applying dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 3 |
1 files changed, 3 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) { struct nfs_pgio_mirror *mirror; + if (pgio->pg_ops && pgio->pg_ops->pg_cleanup) + pgio->pg_ops->pg_cleanup(pgio); + pgio->pg_ops = &nfs_pgio_rw_ops; /* read path should never have more than one mirror */ |