diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-11-02 17:32:54 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-11-02 17:32:54 +0100 |
| commit | 615240e75926a656ac1c6b118ee8a7babc35142d (patch) | |
| tree | 506fc67e9c1eb403905d30f81f809b542f30a952 /fs/nfs/read.c | |
| parent | 94666f64985e7b83f2af0b03a7849686d2590103 (diff) | |
| parent | 10f9e3bce7f3ab7ab4d09a9b78c7208c9a1455f7 (diff) | |
Merge branch 'linux-4.1.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1.y-rt
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:
arch/x86/include/asm/preempt.h
include/linux/sched.h
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 */ |