Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19ddab06 authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: close sequence setup/done support 



Separate nfs4_close calls from nfs41: sequence setup/done support
Call nfs4_sequence_done from respective rpc_call_done methods.

Note that we need to pass a pointer to the nfs_server in calls data
for passing on to nfs4_sequence_done.

Signed-off-by: default avatarAndy <Adamson&lt;andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[pnfs: client data server write validate and release]
Signed-off-by: default avatarAndy <Adamson&lt;andros@umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfs41: separate free slot from sequence done]
[nfs41: sequence res use slotid]
[nfs41: remove SEQ4_STATUS_USE_TK_STATUS]
[nfs41: nfs4_sequence_free_slot use nfs_client for data server]
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 69ab40c4

fs/nfs/nfs4proc.c

+7 −1
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
	struct nfs4_state *state = calldata->state;

	struct nfs_server *server = NFS_SERVER(calldata->inode);



	nfs4_sequence_done(server, &calldata->res.seq_res, task->tk_status);

	if (RPC_ASSASSINATED(task))

		return;

        /* hmm. we are done with the inode, and in the process of freeing
@@ -1652,6 +1653,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
				return;

			}

	}

	nfs4_sequence_free_slot(server->nfs_client, &calldata->res.seq_res);

	nfs_refresh_inode(calldata->inode, calldata->res.fattr);

}
@@ -1692,6 +1694,10 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) 
		calldata->arg.fmode = FMODE_WRITE;

	}

	calldata->timestamp = jiffies;

	if (nfs4_setup_sequence((NFS_SERVER(calldata->inode))->nfs_client,

				&calldata->arg.seq_args, &calldata->res.seq_res,

				1, task))

		return;

	rpc_call_start(task);

}
@@ -1731,7 +1737,7 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, int wait) 
	};

	int status = -ENOMEM;



	calldata = kmalloc(sizeof(*calldata), GFP_KERNEL);

	calldata = kzalloc(sizeof(*calldata), GFP_KERNEL);

	if (calldata == NULL)

		goto out;

	calldata->inode = state->inode;