1 files changed, 7 insertions, 36 deletions

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index b96736df98e8..ea83f3c03c65 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1841,7 +1841,8 @@ void pnfs_ld_write_done(struct nfs_pgio_header *hdr)
 {
         trace_nfs4_pnfs_write(hdr, hdr->pnfs_error);
         if (!hdr->pnfs_error) {
-                pnfs_set_layoutcommit(hdr);
+                pnfs_set_layoutcommit(hdr->inode, hdr->lseg,
+                                hdr->mds_offset + hdr->res.count);
                 hdr->mds_ops->rpc_call_done(&hdr->task, hdr);
         } else
                 pnfs_ld_handle_write_error(hdr);
@@ -2099,11 +2100,10 @@ void pnfs_set_lo_fail(struct pnfs_layout_segment *lseg)
 EXPORT_SYMBOL_GPL(pnfs_set_lo_fail);
 
 void
-pnfs_set_layoutcommit(struct nfs_pgio_header *hdr)
+pnfs_set_layoutcommit(struct inode *inode, struct pnfs_layout_segment *lseg,
+                loff_t end_pos)
 {
-        struct inode *inode = hdr->inode;
         struct nfs_inode *nfsi = NFS_I(inode);
-        loff_t end_pos = hdr->mds_offset + hdr->res.count;
         bool mark_as_dirty = false;
 
         spin_lock(&inode->i_lock);
@@ -2114,13 +2114,13 @@ pnfs_set_layoutcommit(struct nfs_pgio_header *hdr)
                         __func__, inode->i_ino);
         } else if (end_pos > nfsi->layout->plh_lwb)
                 nfsi->layout->plh_lwb = end_pos;
-        if (!test_and_set_bit(NFS_LSEG_LAYOUTCOMMIT, &hdr->lseg->pls_flags)) {
+        if (!test_and_set_bit(NFS_LSEG_LAYOUTCOMMIT, &lseg->pls_flags)) {
                 /* references matched in nfs4_layoutcommit_release */
-                pnfs_get_lseg(hdr->lseg);
+                pnfs_get_lseg(lseg);
         }
         spin_unlock(&inode->i_lock);
         dprintk("%s: lseg %p end_pos %llu\n",
-                __func__, hdr->lseg, nfsi->layout->plh_lwb);
+                __func__, lseg, nfsi->layout->plh_lwb);
 
         /* if pnfs_layoutcommit_inode() runs between inode locks, the next one
          * will be a noop because NFS_INO_LAYOUTCOMMIT will not be set */
@@ -2129,35 +2129,6 @@ pnfs_set_layoutcommit(struct nfs_pgio_header *hdr)
 }
 EXPORT_SYMBOL_GPL(pnfs_set_layoutcommit);
 
-void pnfs_commit_set_layoutcommit(struct nfs_commit_data *data)
-{
-        struct inode *inode = data->inode;
-        struct nfs_inode *nfsi = NFS_I(inode);
-        bool mark_as_dirty = false;
-
-        spin_lock(&inode->i_lock);
-        if (!test_and_set_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags)) {
-                nfsi->layout->plh_lwb = data->lwb;
-                mark_as_dirty = true;
-                dprintk("%s: Set layoutcommit for inode %lu ",
-                        __func__, inode->i_ino);
-        } else if (data->lwb > nfsi->layout->plh_lwb)
-                nfsi->layout->plh_lwb = data->lwb;
-        if (!test_and_set_bit(NFS_LSEG_LAYOUTCOMMIT, &data->lseg->pls_flags)) {
-                /* references matched in nfs4_layoutcommit_release */
-                pnfs_get_lseg(data->lseg);
-        }
-        spin_unlock(&inode->i_lock);
-        dprintk("%s: lseg %p end_pos %llu\n",
-                __func__, data->lseg, nfsi->layout->plh_lwb);
-
-        /* if pnfs_layoutcommit_inode() runs between inode locks, the next one
-         * will be a noop because NFS_INO_LAYOUTCOMMIT will not be set */
-        if (mark_as_dirty)
-                mark_inode_dirty_sync(inode);
-}
-EXPORT_SYMBOL_GPL(pnfs_commit_set_layoutcommit);
-
 void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data)
 {
         struct nfs_server *nfss = NFS_SERVER(data->args.inode);