[RFC,06/12] nfs: merge pnfs_try_to_write_data() and pnfs_do_write()

Commit Message

Schumaker, Anna May 20, 2014, 6:08 p.m. UTC

This makes these functions look neater in preparation for combining with
their read equivalents.

Signed-off-by: Anna Schumaker <[e-mail]>
---
 fs/nfs/pnfs.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

Patch

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index a0eee54..355cd41 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1511,38 +1511,24 @@  void pnfs_ld_write_done(struct nfs_pgio_header *hdr)
 EXPORT_SYMBOL_GPL(pnfs_ld_write_done);
 
 static enum pnfs_try_status
-pnfs_try_to_write_data(struct nfs_pgio_header *hdr,
-			const struct rpc_call_ops *call_ops,
-			struct pnfs_layout_segment *lseg,
-			int how)
+pnfs_try_to_write_data(struct nfs_pgio_header *hdr, int how)
 {
-	struct inode *inode = hdr->inode;
-	enum pnfs_try_status trypnfs;
-	struct nfs_server *nfss = NFS_SERVER(inode);
-
-	hdr->mds_ops = call_ops;
-
-	dprintk("%s: Writing ino:%lu %u@%llu (how %d)\n", __func__,
-		inode->i_ino, hdr->args.count, hdr->args.offset, how);
-	trypnfs = nfss->pnfs_curr_ld->write_pagelist(hdr, how);
-	if (trypnfs != PNFS_NOT_ATTEMPTED)
-		nfs_inc_stats(inode, NFSIOS_PNFS_WRITE);
-	dprintk("%s End (trypnfs:%d)\n", __func__, trypnfs);
-	return trypnfs;
+	return NFS_SERVER(hdr->inode)->pnfs_curr_ld->write_pagelist(hdr, how);
 }
 
 static void
 pnfs_do_write(struct nfs_pageio_descriptor *desc,
 	      struct nfs_pgio_header *hdr, int how)
 {
-	const struct rpc_call_ops *call_ops = desc->pg_rpc_callops;
 	struct pnfs_layout_segment *lseg = desc->pg_lseg;
-	enum pnfs_try_status trypnfs;
 
+	hdr->mds_ops = desc->pg_rpc_callops;
 	desc->pg_lseg = NULL;
-	trypnfs = pnfs_try_to_write_data(hdr, call_ops, lseg, how);
-	if (trypnfs == PNFS_NOT_ATTEMPTED)
+
+	if (pnfs_try_to_write_data(hdr, how) == PNFS_NOT_ATTEMPTED)
 		pnfs_through_mds(desc, hdr);
+	else
+		nfs_inc_stats(hdr->inode, NFSIOS_PNFS_WRITE);
 	pnfs_put_lseg(lseg);
 }