3 files changed, 18 insertions, 8 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 194c48410336..49eeb044c109 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -99,7 +99,8 @@ static void filelayout_reset_write(struct nfs_write_data *data)
 
                 task->tk_status = pnfs_write_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
         }
 }
 
@@ -119,7 +120,8 @@ static void filelayout_reset_read(struct nfs_read_data *data)
 
                 task->tk_status = pnfs_read_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
         }
 }
 
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 6be70f622b62..97767c8683f9 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1422,13 +1422,15 @@ EXPORT_SYMBOL_GPL(pnfs_generic_pg_test);
 
 int pnfs_write_done_resend_to_mds(struct inode *inode,
                                 struct list_head *head,
-                                const struct nfs_pgio_completion_ops *compl_ops)
+                                const struct nfs_pgio_completion_ops *compl_ops,
+                                struct nfs_direct_req *dreq)
 {
         struct nfs_pageio_descriptor pgio;
         LIST_HEAD(failed);
 
         /* Resend all requests through the MDS */
         nfs_pageio_init_write(&pgio, inode, FLUSH_STABLE, compl_ops);
+        pgio.pg_dreq = dreq;
         while (!list_empty(head)) {
                 struct nfs_page *req = nfs_list_entry(head->next);
 
@@ -1463,7 +1465,8 @@ static void pnfs_ld_handle_write_error(struct nfs_write_data *data)
         if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags))
                 data->task.tk_status = pnfs_write_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
 }
 
 /*
@@ -1578,13 +1581,15 @@ EXPORT_SYMBOL_GPL(pnfs_generic_pg_writepages);
 
 int pnfs_read_done_resend_to_mds(struct inode *inode,
                                 struct list_head *head,
-                                const struct nfs_pgio_completion_ops *compl_ops)
+                                const struct nfs_pgio_completion_ops *compl_ops,
+                                struct nfs_direct_req *dreq)
 {
         struct nfs_pageio_descriptor pgio;
         LIST_HEAD(failed);
 
         /* Resend all requests through the MDS */
         nfs_pageio_init_read(&pgio, inode, compl_ops);
+        pgio.pg_dreq = dreq;
         while (!list_empty(head)) {
                 struct nfs_page *req = nfs_list_entry(head->next);
 
@@ -1615,7 +1620,8 @@ static void pnfs_ld_handle_read_error(struct nfs_read_data *data)
         if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags))
                 data->task.tk_status = pnfs_read_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
 }
 
 /*
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 97cb358bb882..94ba80417748 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -230,9 +230,11 @@ struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino,
 
 void nfs4_deviceid_mark_client_invalid(struct nfs_client *clp);
 int pnfs_read_done_resend_to_mds(struct inode *inode, struct list_head *head,
-                        const struct nfs_pgio_completion_ops *compl_ops);
+                        const struct nfs_pgio_completion_ops *compl_ops,
+                        struct nfs_direct_req *dreq);
 int pnfs_write_done_resend_to_mds(struct inode *inode, struct list_head *head,
-                        const struct nfs_pgio_completion_ops *compl_ops);
+                        const struct nfs_pgio_completion_ops *compl_ops,
+                        struct nfs_direct_req *dreq);
 struct nfs4_threshold *pnfs_mdsthreshold_alloc(void);
 
 /* nfs4_deviceid_flags */