pNFS/flexfiles: Fix up the ff_layout_write_pagelist failure path

If the attempt to write through pNFS fails, we need to use the same
failure semantics as for the read path: If the FF_FLAGS_NO_IO_THRU_MDS
flag is set or we have sufficient valid DSes, then we must retry through
pNFS

Fixes: d67ae825a59d ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index e45b3ffeda08..6c2e4c73684c 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2292,8 +2292,20 @@ pnfs_do_write(struct nfs_pageio_descriptor *desc,
         enum pnfs_try_status trypnfs;
 
         trypnfs = pnfs_try_to_write_data(hdr, call_ops, lseg, how);
-        if (trypnfs == PNFS_NOT_ATTEMPTED)
+        switch (trypnfs) {
+        case PNFS_NOT_ATTEMPTED:
                 pnfs_write_through_mds(desc, hdr);
+        case PNFS_ATTEMPTED:
+                break;
+        case PNFS_TRY_AGAIN:
+                /* cleanup hdr and prepare to redo pnfs */
+                if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
+                        struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
+                        list_splice_init(&hdr->pages, &mirror->pg_list);
+                        mirror->pg_recoalesce = 1;
+                }
+                hdr->mds_ops->rpc_release(hdr);
+        }
 }
 
 static void pnfs_writehdr_free(struct nfs_pgio_header *hdr)