NFSv4.1/flexfiles: Clean up ff_layout_write_done_cb/ff_layout_commit_done_cb

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 3f073a7de870..fbc5a56de875 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1342,14 +1342,12 @@ static int ff_layout_write_done_cb(struct rpc_task *task,
 
         switch (err) {
         case -NFS4ERR_RESET_TO_PNFS:
+                pnfs_set_retry_layoutget(hdr->lseg->pls_layout);
+                ff_layout_reset_write(hdr, true);
+                return task->tk_status;
         case -NFS4ERR_RESET_TO_MDS:
-                if (err == -NFS4ERR_RESET_TO_PNFS) {
-                        pnfs_set_retry_layoutget(hdr->lseg->pls_layout);
-                        ff_layout_reset_write(hdr, true);
-                } else {
-                        pnfs_clear_retry_layoutget(hdr->lseg->pls_layout);
-                        ff_layout_reset_write(hdr, false);
-                }
+                pnfs_clear_retry_layoutget(hdr->lseg->pls_layout);
+                ff_layout_reset_write(hdr, false);
                 return task->tk_status;
         case -EAGAIN:
                 rpc_restart_call_prepare(task);
@@ -1384,11 +1382,11 @@ static int ff_layout_commit_done_cb(struct rpc_task *task,
 
         switch (err) {
         case -NFS4ERR_RESET_TO_PNFS:
+                pnfs_set_retry_layoutget(data->lseg->pls_layout);
+                pnfs_generic_prepare_to_resend_writes(data);
+                return -EAGAIN;
         case -NFS4ERR_RESET_TO_MDS:
-                if (err == -NFS4ERR_RESET_TO_PNFS)
-                        pnfs_set_retry_layoutget(data->lseg->pls_layout);
-                else
-                        pnfs_clear_retry_layoutget(data->lseg->pls_layout);
+                pnfs_clear_retry_layoutget(data->lseg->pls_layout);
                 pnfs_generic_prepare_to_resend_writes(data);
                 return -EAGAIN;
         case -EAGAIN: