NFSv4.1/pnfs: Ensure we send layoutcommit before return-on-close

We must not send a close or delegreturn that would result in a
return-on-close of the layout without ensuring that we've also
sent the necessary layoutcommit.

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

1 files changed, 4 insertions, 1 deletions

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index ea83f3c03c65..c2ce2db771b7 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1090,6 +1090,7 @@ bool pnfs_roc(struct inode *ino)
         pnfs_get_layout_hdr(lo); /* matched in pnfs_roc_release */
         spin_unlock(&ino->i_lock);
         pnfs_free_lseg_list(&tmp_list);
+        pnfs_layoutcommit_inode(ino, true);
         return true;
 
 out_noroc:
@@ -1104,8 +1105,10 @@ out_noroc:
                 }
         }
         spin_unlock(&ino->i_lock);
-        if (layoutreturn)
+        if (layoutreturn) {
+                pnfs_layoutcommit_inode(ino, true);
                 pnfs_send_layoutreturn(lo, stateid, IOMODE_ANY, true);
+        }
         return false;
 }