SQUASHME pnfs-submit pnfs operations use new nfs4_sequence_done

PATCH In review [email protected] 2 participants 4 messages Jul 16, 2010 – Jul 19, 2010

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

[email protected]

author

2010-07-16 15:57 UTC #0 lore raw

PATCH 1/1 SQUASHME pnfs-submit pnfs operations use new nfs4_sequence_done

From: Andy Adamson <[email protected]>

Signed-off-by Andy Adamson <[email protected]>

---
 fs/nfs/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

fs/nfs/nfs4proc.c +3 -3

index f5779a1..17b0c31 100644
@@ -5448,7 +5448,7 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lgp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lgp->res.seq_res);
 
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5558,7 +5558,7 @@ pnfs_layoutcommit_done(struct rpc_task *task, void *calldata)
 		(struct pnfs_layoutcommit_data *)calldata;
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
-	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &data->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5666,7 +5666,7 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lrp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lrp->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

Signature · 1 line

1.6.6

[email protected]

author

2010-07-16 15:57 UTC #1 lore raw

PATCH 1/1 SQUASHME pnfs-submit pnfs operations use new nfs4_sequence_done

From: Andy Adamson <[email protected]>

Signed-off-by Andy Adamson <[email protected]>

---
 fs/nfs/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

fs/nfs/nfs4proc.c +3 -3

index f5779a1..17b0c31 100644
@@ -5448,7 +5448,7 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lgp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lgp->res.seq_res);
 
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5558,7 +5558,7 @@ pnfs_layoutcommit_done(struct rpc_task *task, void *calldata)
 		(struct pnfs_layoutcommit_data *)calldata;
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
-	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &data->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5666,7 +5666,7 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lrp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lrp->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

Signature · 1 line

1.6.6

Benny Halevy

2010-07-19 08:46 UTC #2 lore raw

Andy, I've fixed this already in my tree, but with additionaly checking on nfs4_sequence_done's status:

if (!nfs4_sequence_done(task, &res))

	return 0;

Benny

Quoted 38 lines · On Jul. 16, 2010, 18:56 +0300, [email protected] wrote:

From: Andy Adamson <[email protected]>

Signed-off-by Andy Adamson <[email protected]>

---
 fs/nfs/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

fs/nfs/nfs4proc.c +3 -3

index f5779a1..17b0c31 100644
@@ -5448,7 +5448,7 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lgp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lgp->res.seq_res);
 
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5558,7 +5558,7 @@ pnfs_layoutcommit_done(struct rpc_task *task, void *calldata)
 		(struct pnfs_layoutcommit_data *)calldata;
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
-	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &data->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5666,7 +5666,7 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lrp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lrp->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

Andy Adamson

author

2010-07-19 13:44 UTC #3 lore raw

OK - Thanks for the heads up

-->Andy

Quoted 47 lines · Benny Halevy

Andy, I've fixed this already in my tree, but with additionaly checking on nfs4_sequence_done's status:

if (!nfs4_sequence_done(task, &res))

	return 0;

Benny

Quoted 38 lines · On Jul. 16, 2010, 18:56 +0300, [email protected] wrote:

From: Andy Adamson <[email protected]>

Signed-off-by Andy Adamson <[email protected]>

---
fs/nfs/nfs4proc.c | 6 +++---

1 files changed, 3 insertions(+), 3 deletions(-)

fs/nfs/nfs4proc.c +3 -3

index f5779a1..17b0c31 100644
@@ -5448,7 +5448,7 @@ static void nfs4_pnfs_layoutget_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lgp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lgp->res.seq_res);
 
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5558,7 +5558,7 @@ pnfs_layoutcommit_done(struct rpc_task *task, void *calldata)
 		(struct pnfs_layoutcommit_data *)calldata;
 	struct nfs_server *server = NFS_SERVER(data->args.inode);
 
-	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &data->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;

@@ -5666,7 +5666,7 @@ static void nfs4_pnfs_layoutreturn_done(struct rpc_task *task, void *calldata)
 
 	dprintk("--> %s\n", __func__);
 
-	nfs4_sequence_done(server, &lrp->res.seq_res, task->tk_status);
+	nfs4_sequence_done(task, &lrp->res.seq_res);
 	if (RPC_ASSASSINATED(task))
 		return;