Skip to contentSkip to conversation

pnfs: merge sync and async layoutcommit calls

PATCH In review [email protected] 2 participants 9 messages Jun 17, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover pnfs: merge sync and async layoutcommit calls

Remove layout driver API calls unused by the file layout. 0001-SQUASHME-pnfs-submit-remove-setup_layoutcommit.patch 0002-SQUASHNE-pnfs-submit-remove-cleanup_layoutcommit.patch 0003-SQUASHME-pnfs-submit-remove-encode_layoutcommit.patch

0004-pnfs-submit-merge-sync-and-async-layoutcommit.patch

Restore the layout API calls for other drivers. 0005-pnfs-post-submit-restore-encode_layoutcommit.patch 0006-pnfs-post-submit-restore-cleanup_layoutcommit.patch 0007-pnfs-post-submit-restore-setup_layoutcommit.patch

-->Andy

#1 lore raw

PATCH 1/7 SQUASHME pnfs-submit: remove setup_layoutcommit

From: Andy Adamson <[email protected]>

Not used by the file layout driver

---
 fs/nfs/pnfs.c             |    7 -------
 include/linux/nfs4_pnfs.h |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)
fs/nfs/pnfs.c +0 -7
index 750ef22..96e8b5b 100644
@@ -1586,7 +1586,6 @@ pnfs_layoutcommit_setup(struct inode *inode,
 			struct pnfs_layoutcommit_data *data,
 			loff_t write_begin_pos, loff_t write_end_pos, int sync)
 {
-	struct nfs_inode *nfsi = NFS_I(inode);
 	struct nfs_server *nfss = NFS_SERVER(inode);
 	int result = 0;
 
@@ -1612,12 +1611,6 @@ pnfs_layoutcommit_setup(struct inode *inode,
 	data->args.bitmask = nfss->attr_bitmask;
 	data->res.server = nfss;
 
-	/* Call layout driver to set the arguments.
-	 */
-	if (nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit)
-		result = nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit(
-				&nfsi->layout, &data->args);
-
 	dprintk("%s End Status %d\n", __func__, result);
 	return result;
 }
include/linux/nfs4_pnfs.h +0 -2
index a88cd69..b635573 100644
@@ -154,8 +154,6 @@ struct layoutdriver_io_operations {
 	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
-	int (*setup_layoutcommit) (struct pnfs_layout_type *layoutid,
-				    struct pnfs_layoutcommit_arg *args);
 	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
 				     struct xdr_stream *xdr,
 				     const struct pnfs_layoutcommit_arg *args);
Signature · 1 line
1.6.6
#2 lore raw

PATCH 2/7 SQUASHNE pnfs-submit: remove cleanup_layoutcommit

From: Andy Adamson <[email protected]>

Not used by the file layout driver

---
 fs/nfs/nfs4proc.c         |    4 ++--
 fs/nfs/pnfs.c             |   24 ------------------------
 fs/nfs/pnfs.h             |    1 -
 include/linux/nfs4_pnfs.h |    3 ---
 4 files changed, 2 insertions(+), 30 deletions(-)
fs/nfs/nfs4proc.c +2 -2
index c7d68f5..1269689 100644
@@ -5638,7 +5638,7 @@ static int pnfs4_sync_layoutcommit(struct pnfs_layoutcommit_data *data)
 	} while (exception.retry);
 
 	data->status = err;
-	pnfs_layoutcommit_done(data);
+	put_rpccred(data->cred);
 	pnfs_layoutcommit_free(data);
 	return err;
 }
@@ -5663,7 +5663,7 @@ pnfs_layoutcommit_rpc_done(struct rpc_task *task, void *calldata)
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
 	data->status = task->tk_status;
-	pnfs_layoutcommit_done(data);
+	put_rpccred(data->cred);
 
 	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
 
fs/nfs/pnfs.c +0 -24
index 96e8b5b..e19e9be 100644
@@ -1554,30 +1554,6 @@ pnfs_commit(struct nfs_write_data *data, int sync)
 	return trypnfs;
 }
 
-/* Called on completion of layoutcommit */
-void
-pnfs_layoutcommit_done(struct pnfs_layoutcommit_data *data)
-{
-	struct nfs_server *nfss = NFS_SERVER(data->args.inode);
-	struct nfs_inode *nfsi = NFS_I(data->args.inode);
-
-	dprintk("%s: (status %d)\n", __func__, data->status);
-
-	if (data->status < 0)
-		printk(KERN_ERR "%s, Layoutcommit Failed! = %d\n",
-		       __func__, data->status);
-
-	/* TODO: Maybe we should avoid this by allowing the layout driver
-	 * to directly xdr its layout on the wire.
-	 */
-	if (nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit)
-		nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit(
-							&nfsi->layout,
-							&data->args,
-							data->status);
-	put_rpccred(data->cred);
-}
-
 /*
  * Set up the argument/result storage required for the RPC call.
  */
fs/nfs/pnfs.h +0 -1
index e802cec..07552d5 100644
@@ -47,7 +47,6 @@ enum pnfs_try_status _pnfs_try_to_read_data(struct nfs_read_data *,
 					    const struct rpc_call_ops *);
 int pnfs_initialize(void);
 void pnfs_uninitialize(void);
-void pnfs_layoutcommit_done(struct pnfs_layoutcommit_data *data);
 void pnfs_layoutcommit_free(struct pnfs_layoutcommit_data *data);
 int pnfs_layoutcommit_inode(struct inode *inode, int sync);
 void pnfs_update_last_write(struct nfs_inode *nfsi, loff_t offset, size_t extent);
include/linux/nfs4_pnfs.h +0 -3
index b635573..1831308 100644
@@ -157,9 +157,6 @@ struct layoutdriver_io_operations {
 	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
 				     struct xdr_stream *xdr,
 				     const struct pnfs_layoutcommit_arg *args);
-	void (*cleanup_layoutcommit) (struct pnfs_layout_type *layoutid,
-				      struct pnfs_layoutcommit_arg *args,
-				      int status);
 	void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct nfs4_pnfs_layoutreturn_arg *args);
Signature · 1 line
1.6.6
#3 lore raw

PATCH 3/7 SQUASHME pnfs-submit: remove encode_layoutcommit

From: Andy Adamson <[email protected]>

Not used by the file layout driver

---
 fs/nfs/nfs4xdr.c          |   11 ++---------
 include/linux/nfs4_pnfs.h |    3 ---
 2 files changed, 2 insertions(+), 12 deletions(-)
fs/nfs/nfs4xdr.c +2 -9
index 301ae14..478b66f 100644
@@ -1856,8 +1856,6 @@ encode_layoutcommit(struct xdr_stream *xdr,
 		    const struct pnfs_layoutcommit_arg *args,
 		    struct compound_hdr *hdr)
 {
-	struct layoutdriver_io_operations *ld_io_ops =
-			NFS_SERVER(args->inode)->pnfs_curr_ld->ld_io_ops;
 	__be32 *p;
 
 	dprintk("%s: %llu@%llu lbw: %llu type: %d\n", __func__,
@@ -1883,13 +1881,8 @@ encode_layoutcommit(struct xdr_stream *xdr,
 	p = reserve_space(xdr, 4);
 	*p = cpu_to_be32(args->layout_type);
 
-	if (ld_io_ops->encode_layoutcommit)
-		ld_io_ops->encode_layoutcommit(
-			&NFS_I(args->inode)->layout, xdr, args);
-	else {
-		p = reserve_space(xdr, 4);
-		xdr_encode_opaque(p, NULL, 0);
-	}
+	p = reserve_space(xdr, 4);
+	xdr_encode_opaque(p, NULL, 0);
 
 	hdr->nops++;
 	hdr->replen += decode_layoutcommit_maxsz;
include/linux/nfs4_pnfs.h +0 -3
index 1831308..d20b5de 100644
@@ -154,9 +154,6 @@ struct layoutdriver_io_operations {
 	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
-	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
-				     struct xdr_stream *xdr,
-				     const struct pnfs_layoutcommit_arg *args);
 	void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct nfs4_pnfs_layoutreturn_arg *args);
Signature · 1 line
1.6.6
#4 lore raw

PATCH 4/7 pnfs-submit: merge sync and async layoutcommit

From: Andy Adamson <[email protected]>

---
 fs/nfs/nfs4proc.c        |   80 ++++++++++++++++------------------------------
 fs/nfs/pnfs.c            |   11 +++---
 fs/nfs/pnfs.h            |    3 +-
 include/linux/pnfs_xdr.h |    1 -
 4 files changed, 35 insertions(+), 60 deletions(-)
fs/nfs/nfs4proc.c +28 -52
index 1269689..71cb928 100644
@@ -5603,46 +5603,6 @@ out:
 	return status;
 }
 
-static int _pnfs4_sync_layoutcommit(struct pnfs_layoutcommit_data *data)
-{
-	struct inode *inode = data->args.inode;
-	struct nfs_fattr *fattr = data->res.fattr;
-	struct nfs_server *server = NFS_SERVER(inode);
-	struct rpc_message msg = {
-		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PNFS_LAYOUTCOMMIT],
-		.rpc_argp = &data->args,
-		.rpc_resp = &data->res,
-		.rpc_cred = data->cred,
-	};
-	int status;
-
-	dprintk("NFS call layoutcommit %lld @ %lld\n",
-		data->args.lseg.length, data->args.lseg.offset);
-
-	nfs_fattr_init(fattr);
-	status = nfs4_call_sync(server, &msg, &data->args, &data->res, 0);
-	dprintk("NFS reply layoutcommit: %d\n", status);
-
-	return status;
-}
-
-static int pnfs4_sync_layoutcommit(struct pnfs_layoutcommit_data *data)
-{
-	struct nfs4_exception exception = { };
-	int err;
-
-	do {
-		err = nfs4_handle_exception(NFS_SERVER(data->args.inode),
-					_pnfs4_sync_layoutcommit(data),
-					&exception);
-	} while (exception.retry);
-
-	data->status = err;
-	put_rpccred(data->cred);
-	pnfs_layoutcommit_free(data);
-	return err;
-}
-
 static void pnfs_layoutcommit_prepare(struct rpc_task *task, void *data)
 {
 	struct pnfs_layoutcommit_data *ldata =
@@ -5656,14 +5616,13 @@ static void pnfs_layoutcommit_prepare(struct rpc_task *task, void *data)
 }
 
 static void
-pnfs_layoutcommit_rpc_done(struct rpc_task *task, void *calldata)
+pnfs_layoutcommit_done(struct rpc_task *task, void *calldata)
 {
 	struct pnfs_layoutcommit_data *data =
 		(struct pnfs_layoutcommit_data *)calldata;
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
 	data->status = task->tk_status;
-	put_rpccred(data->cred);
 
 	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
 
@@ -5673,18 +5632,22 @@ pnfs_layoutcommit_rpc_done(struct rpc_task *task, void *calldata)
 
 static void pnfs_layoutcommit_release(void *lcdata)
 {
+	struct pnfs_layoutcommit_data *data =
+		(struct pnfs_layoutcommit_data *)lcdata;
+
+	put_rpccred(data->cred);
 	pnfs_layoutcommit_free(lcdata);
 }
 
 static const struct rpc_call_ops pnfs_layoutcommit_ops = {
 	.rpc_call_prepare = pnfs_layoutcommit_prepare,
-	.rpc_call_done = pnfs_layoutcommit_rpc_done,
+	.rpc_call_done = pnfs_layoutcommit_done,
 	.rpc_release = pnfs_layoutcommit_release,
 };
 
 /* Execute a layoutcommit to the server */
 static int
-pnfs_async_layoutcommit(struct pnfs_layoutcommit_data *data)
+_pnfs4_proc_layoutcommit(struct pnfs_layoutcommit_data *data, int issync)
 {
 	struct rpc_message msg = {
 		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PNFS_LAYOUTCOMMIT],
@@ -5701,30 +5664,43 @@ pnfs_async_layoutcommit(struct pnfs_layoutcommit_data *data)
 		.flags = RPC_TASK_ASYNC,
 	};
 	struct rpc_task *task;
+	int status = 0;
 
 	dprintk("NFS: %4d initiating layoutcommit call. %llu@%llu lbw: %llu "
-		"type: %d\n",
+		"type: %d issync %d\n",
 		data->task.tk_pid,
 		data->args.lseg.length,
 		data->args.lseg.offset,
 		data->args.lastbytewritten,
-		data->args.layout_type);
+		data->args.layout_type, issync);
 
 	data->res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;
 	task = rpc_run_task(&task_setup_data);
 	if (IS_ERR(task))
 		return PTR_ERR(task);
-	dprintk("%s: rpc_run_task returned error %ld\n",
-		__func__, PTR_ERR(task));
+	if (!issync)
+		goto out;
+	status = nfs4_wait_for_completion_rpc_task(task);
+	if (status != 0)
+		goto out;
+	status = data->status;
+out:
+	dprintk("%s: status %d\n", __func__, status);
 	rpc_put_task(task);
 	return 0;
 }
 
-int pnfs4_proc_layoutcommit(struct pnfs_layoutcommit_data *data)
+int pnfs4_proc_layoutcommit(struct pnfs_layoutcommit_data *data, int issync)
 {
-	return data->is_sync ?
-			pnfs4_sync_layoutcommit(data) :
-			pnfs_async_layoutcommit(data);
+	struct nfs4_exception exception = { };
+	int err;
+
+	do {
+		err = nfs4_handle_exception(NFS_SERVER(data->args.inode),
+					_pnfs4_proc_layoutcommit(data, issync),
+					&exception);
+	} while (exception.retry);
+	return err;
 }
 
 static void
fs/nfs/pnfs.c +5 -6
index e19e9be..a2754aa 100644
@@ -1560,14 +1560,13 @@ pnfs_commit(struct nfs_write_data *data, int sync)
 static int
 pnfs_layoutcommit_setup(struct inode *inode,
 			struct pnfs_layoutcommit_data *data,
-			loff_t write_begin_pos, loff_t write_end_pos, int sync)
+			loff_t write_begin_pos, loff_t write_end_pos)
 {
 	struct nfs_server *nfss = NFS_SERVER(inode);
 	int result = 0;
 
-	dprintk("%s Begin (sync:%d)\n", __func__, sync);
+	dprintk("--> %s\n", __func__);
 
-	data->is_sync = sync;
 	data->args.inode = inode;
 	data->args.fh = NFS_FH(inode);
 	data->args.layout_type = nfss->pnfs_curr_ld->id;
@@ -1587,7 +1586,7 @@ pnfs_layoutcommit_setup(struct inode *inode,
 	data->args.bitmask = nfss->attr_bitmask;
 	data->res.server = nfss;
 
-	dprintk("%s End Status %d\n", __func__, result);
+	dprintk("<-- %s Status %d\n", __func__, result);
 	return result;
 }
 
@@ -1632,13 +1631,13 @@ pnfs_layoutcommit_inode(struct inode *inode, int sync)
 
 	/* Set up layout commit args */
 	status = pnfs_layoutcommit_setup(inode, data, write_begin_pos,
-					 write_end_pos, sync);
+					 write_end_pos);
 	if (status) {
 		/* The layout driver failed to setup the layoutcommit */
 		put_rpccred(data->cred);
 		goto out_free;
 	}
-	status = pnfs4_proc_layoutcommit(data);
+	status = pnfs4_proc_layoutcommit(data, sync);
 out:
 	dprintk("%s end (err:%d)\n", __func__, status);
 	return status;
fs/nfs/pnfs.h +2 -1
index 07552d5..78776f3 100644
@@ -25,7 +25,8 @@
 extern int nfs4_pnfs_getdeviceinfo(struct nfs_server *server,
 				   struct pnfs_device *dev);
 extern int pnfs4_proc_layoutget(struct nfs4_pnfs_layoutget *lgp);
-extern int pnfs4_proc_layoutcommit(struct pnfs_layoutcommit_data *data);
+extern int pnfs4_proc_layoutcommit(struct pnfs_layoutcommit_data *data,
+				   int issync);
 extern int pnfs4_proc_layoutreturn(struct nfs4_pnfs_layoutreturn *lrp, bool wait);
 
 /* pnfs.c */
include/linux/pnfs_xdr.h +0 -1
index 154b04e..d3d0d78 100644
@@ -83,7 +83,6 @@ struct pnfs_layoutcommit_res {
 
 struct pnfs_layoutcommit_data {
 	struct rpc_task task;
-	bool is_sync;
 	struct rpc_cred *cred;
 	struct nfs_fattr fattr;
 	struct pnfs_layoutcommit_arg args;
Signature · 1 line
1.6.6
#5 lore raw

PATCH 5/7 pnfs-post-submit: restore encode_layoutcommit

From: Andy Adamson <[email protected]>

---
 fs/nfs/nfs4xdr.c          |   11 +++++++++--
 include/linux/nfs4_pnfs.h |    3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)
fs/nfs/nfs4xdr.c +9 -2
index 478b66f..45578fb 100644
@@ -1856,6 +1856,8 @@ encode_layoutcommit(struct xdr_stream *xdr,
 		    const struct pnfs_layoutcommit_arg *args,
 		    struct compound_hdr *hdr)
 {
+	struct layoutdriver_io_operations *ld_io_ops =
+			NFS_SERVER(args->inode)->pnfs_curr_ld->ld_io_ops;
 	__be32 *p;
 
 	dprintk("%s: %llu@%llu lbw: %llu type: %d\n", __func__,
@@ -1881,8 +1883,13 @@ encode_layoutcommit(struct xdr_stream *xdr,
 	p = reserve_space(xdr, 4);
 	*p = cpu_to_be32(args->layout_type);
 
-	p = reserve_space(xdr, 4);
-	xdr_encode_opaque(p, NULL, 0);
+	if (ld_io_ops->encode_layoutcommit) {
+		ld_io_ops->encode_layoutcommit(&NFS_I(args->inode)->layout,
+					       xdr, args);
+	} else {
+		p = reserve_space(xdr, 4);
+		xdr_encode_opaque(p, NULL, 0);
+	}
 
 	hdr->nops++;
 	hdr->replen += decode_layoutcommit_maxsz;
include/linux/nfs4_pnfs.h +3 -0
index d20b5de..93fccfd 100644
@@ -154,6 +154,9 @@ struct layoutdriver_io_operations {
 	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
+	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
+				struct xdr_stream *xdr,
+				const struct pnfs_layoutcommit_arg *args);
 	void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct nfs4_pnfs_layoutreturn_arg *args);
Signature · 1 line
1.6.6
#6 lore raw

PATCH 6/7 pnfs-post-submit: restore cleanup_layoutcommit

From: Andy Adamson <[email protected]>

---
 fs/nfs/nfs4proc.c         |    1 +
 fs/nfs/pnfs.c             |   13 +++++++++++++
 fs/nfs/pnfs.h             |    1 +
 include/linux/nfs4_pnfs.h |    3 +++
 4 files changed, 18 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +1 -0
index 71cb928..9328a46 100644
@@ -5635,6 +5635,7 @@ static void pnfs_layoutcommit_release(void *lcdata)
 	struct pnfs_layoutcommit_data *data =
 		(struct pnfs_layoutcommit_data *)lcdata;
 
+	pnfs_cleanup_layoutcommit(lcdata);
 	put_rpccred(data->cred);
 	pnfs_layoutcommit_free(lcdata);
 }
fs/nfs/pnfs.c +13 -0
index a2754aa..cdadddd 100644
@@ -1554,6 +1554,19 @@ pnfs_commit(struct nfs_write_data *data, int sync)
 	return trypnfs;
 }
 
+void pnfs_cleanup_layoutcommit(struct pnfs_layoutcommit_data *data)
+{
+	struct nfs_server *nfss = NFS_SERVER(data->args.inode);
+
+	/* TODO: Maybe we should avoid this by allowing the layout driver
+	* to directly xdr its layout on the wire.
+	*/
+	if (nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit)
+		nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit(
+					&NFS_I(data->args.inode)->layout,
+					&data->args, data->status);
+}
+
 /*
  * Set up the argument/result storage required for the RPC call.
  */
fs/nfs/pnfs.h +1 -0
index 78776f3..ed4191b 100644
@@ -49,6 +49,7 @@ enum pnfs_try_status _pnfs_try_to_read_data(struct nfs_read_data *,
 int pnfs_initialize(void);
 void pnfs_uninitialize(void);
 void pnfs_layoutcommit_free(struct pnfs_layoutcommit_data *data);
+void pnfs_cleanup_layoutcommit(struct pnfs_layoutcommit_data *data);
 int pnfs_layoutcommit_inode(struct inode *inode, int sync);
 void pnfs_update_last_write(struct nfs_inode *nfsi, loff_t offset, size_t extent);
 void pnfs_need_layoutcommit(struct nfs_inode *nfsi, struct nfs_open_context *ctx);
include/linux/nfs4_pnfs.h +3 -0
index 93fccfd..3ff1dc3 100644
@@ -157,6 +157,9 @@ struct layoutdriver_io_operations {
 	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct pnfs_layoutcommit_arg *args);
+	void (*cleanup_layoutcommit) (struct pnfs_layout_type *layoutid,
+				      struct pnfs_layoutcommit_arg *args,
+				      int status);
 	void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct nfs4_pnfs_layoutreturn_arg *args);
Signature · 1 line
1.6.6
#7 lore raw

PATCH 7/7 pnfs-post-submit: restore setup_layoutcommit

From: Andy Adamson <[email protected]>

---
 fs/nfs/pnfs.c             |    5 +++++
 include/linux/nfs4_pnfs.h |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)
fs/nfs/pnfs.c +5 -0
index cdadddd..035cdde 100644
@@ -1599,6 +1599,11 @@ pnfs_layoutcommit_setup(struct inode *inode,
 	data->args.bitmask = nfss->attr_bitmask;
 	data->res.server = nfss;
 
+	/* Call layout driver to set the arguments */
+	if (nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit)
+		result = nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit(
+				&NFS_I(inode)->layout, &data->args);
+
 	dprintk("<-- %s Status %d\n", __func__, result);
 	return result;
 }
include/linux/nfs4_pnfs.h +3 -0
index 3ff1dc3..3a150b1 100644
@@ -154,6 +154,9 @@ struct layoutdriver_io_operations {
 	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr);
 	void (*free_lseg) (struct pnfs_layout_segment *lseg);
 
+	int (*setup_layoutcommit) (struct pnfs_layout_type *layoutid,
+				struct pnfs_layoutcommit_arg *args);
+
 	void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
 				struct xdr_stream *xdr,
 				const struct pnfs_layoutcommit_arg *args);
Signature · 1 line
1.6.6
#8 lore raw
In reply to [email protected]
Quoted 5 lines · On Jun. 17, 2010, 15:34 -0400, [email protected] wrote:

Remove layout driver API calls unused by the file layout. 0001-SQUASHME-pnfs-submit-remove-setup_layoutcommit.patch 0002-SQUASHNE-pnfs-submit-remove-cleanup_layoutcommit.patch 0003-SQUASHME-pnfs-submit-remove-encode_layoutcommit.patch

Quoted 9 lines

0004-pnfs-submit-merge-sync-and-async-layoutcommit.patch

Restore the layout API calls for other drivers. 0005-pnfs-post-submit-restore-encode_layoutcommit.patch 0006-pnfs-post-submit-restore-cleanup_layoutcommit.patch 0007-pnfs-post-submit-restore-setup_layoutcommit.patch

-->Andy

All merged at pnfs-all-2.6.35-rc3-2010-06-17-1

Thanks!

Benny