Merge branch 'pnfs_generic'

[karo-tx-linux.git] / fs / nfs / flexfilelayout / flexfilelayout.c

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 2981cd190bfd4f6cdf9c58371c9f4275d276b1f1..18c329b84ffbb2323111f5123d504e1fb22e00d5 100644 (file)
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -941,18 +941,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)
                        hdr->args.count,
                        (unsigned long long)hdr->args.offset);
 
-               if (!hdr->dreq) {
-                       struct nfs_open_context *ctx;
-
-                       ctx = nfs_list_entry(hdr->pages.next)->wb_context;
-                       set_bit(NFS_CONTEXT_RESEND_WRITES, &ctx->flags);
-                       hdr->completion_ops->error_cleanup(&hdr->pages);
-               } else {
-                       nfs_direct_set_resched_writes(hdr->dreq);
-                       /* fake unstable write to let common nfs resend pages */
-                       hdr->verf.committed = NFS_UNSTABLE;
-                       hdr->good_bytes = hdr->args.count;
-               }
+               hdr->completion_ops->reschedule_io(hdr);
                return;
        }