fs/nfs/direct.c         |    6 ++----
 fs/nfs/nfs4xdr.c        |   10 +++++-----
 fs/nfs/read.c           |    6 ++----
 fs/nfs/write.c          |    6 ++----
 include/linux/nfs_xdr.h |    6 ++----
 5 files changed, 13 insertions(+), 21 deletions(-)

diff -u --recursive --new-file --show-c-function linux-2.6.7-06-file_ctx/fs/nfs/direct.c linux-2.6.7-07-file_ctx2/fs/nfs/direct.c
--- linux-2.6.7-06-file_ctx/fs/nfs/direct.c	2004-06-06 13:11:35.000000000 -0400
+++ linux-2.6.7-07-file_ctx2/fs/nfs/direct.c	2004-06-06 13:11:40.000000000 -0400
@@ -130,8 +130,7 @@ nfs_direct_read_seg(struct inode *inode,
 		.cred		= ctx->cred,
 		.args		= {
 			.fh		= NFS_FH(inode),
-			.lockowner	= ctx->lockowner,
-			.state		= ctx->state,
+			.context	= ctx,
 		},
 		.res		= {
 			.fattr		= &rdata.fattr,
@@ -262,8 +261,7 @@ nfs_direct_write_seg(struct inode *inode
 		.cred		= ctx->cred,
 		.args		= {
 			.fh		= NFS_FH(inode),
-			.lockowner	= ctx->lockowner,
-			.state		= ctx->state,
+			.context	= ctx,
 		},
 		.res		= {
 			.fattr		= &wdata.fattr,
diff -u --recursive --new-file --show-c-function linux-2.6.7-06-file_ctx/fs/nfs/nfs4xdr.c linux-2.6.7-07-file_ctx2/fs/nfs/nfs4xdr.c
--- linux-2.6.7-06-file_ctx/fs/nfs/nfs4xdr.c	2004-06-06 13:11:22.000000000 -0400
+++ linux-2.6.7-07-file_ctx2/fs/nfs/nfs4xdr.c	2004-06-06 13:11:40.000000000 -0400
@@ -896,15 +896,15 @@ static int encode_putrootfh(struct xdr_s
         return 0;
 }
 
-static void encode_stateid(struct xdr_stream *xdr, struct nfs4_state *state, fl_owner_t lockowner)
+static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx)
 {
 	extern nfs4_stateid zero_stateid;
 	nfs4_stateid stateid;
 	uint32_t *p;
 
 	RESERVE_SPACE(16);
-	if (state != NULL) {
-		nfs4_copy_stateid(&stateid, state, lockowner);
+	if (ctx->state != NULL) {
+		nfs4_copy_stateid(&stateid, ctx->state, ctx->lockowner);
 		WRITEMEM(stateid.data, sizeof(stateid.data));
 	} else
 		WRITEMEM(zero_stateid.data, sizeof(zero_stateid.data));
@@ -917,7 +917,7 @@ static int encode_read(struct xdr_stream
 	RESERVE_SPACE(4);
 	WRITE32(OP_READ);
 
-	encode_stateid(xdr, args->state, args->lockowner);
+	encode_stateid(xdr, args->context);
 
 	RESERVE_SPACE(12);
 	WRITE64(args->offset);
@@ -1076,7 +1076,7 @@ static int encode_write(struct xdr_strea
 	RESERVE_SPACE(4);
 	WRITE32(OP_WRITE);
 
-	encode_stateid(xdr, args->state, args->lockowner);
+	encode_stateid(xdr, args->context);
 
 	RESERVE_SPACE(16);
 	WRITE64(args->offset);
diff -u --recursive --new-file --show-c-function linux-2.6.7-06-file_ctx/fs/nfs/read.c linux-2.6.7-07-file_ctx2/fs/nfs/read.c
--- linux-2.6.7-06-file_ctx/fs/nfs/read.c	2004-06-06 13:11:35.000000000 -0400
+++ linux-2.6.7-07-file_ctx2/fs/nfs/read.c	2004-06-06 13:13:09.000000000 -0400
@@ -109,8 +109,7 @@ static int nfs_readpage_sync(struct nfs_
 	rdata->inode = inode;
 	INIT_LIST_HEAD(&rdata->pages);
 	rdata->args.fh = NFS_FH(inode);
-	rdata->args.lockowner = ctx->lockowner;
-	rdata->args.state = ctx->state;
+	rdata->args.context = ctx;
 	rdata->args.pages = &page;
 	rdata->args.pgbase = 0UL;
 	rdata->args.count = rsize;
@@ -227,8 +226,7 @@ static void nfs_read_rpcsetup(struct nfs
 	data->args.pgbase = req->wb_pgbase + offset;
 	data->args.pages  = data->pagevec;
 	data->args.count  = count;
-	data->args.lockowner = req->wb_context->lockowner;
-	data->args.state  = req->wb_context->state;
+	data->args.context = req->wb_context;
 
 	data->res.fattr   = &data->fattr;
 	data->res.count   = count;
diff -u --recursive --new-file --show-c-function linux-2.6.7-06-file_ctx/fs/nfs/write.c linux-2.6.7-07-file_ctx2/fs/nfs/write.c
--- linux-2.6.7-06-file_ctx/fs/nfs/write.c	2004-06-06 13:11:35.000000000 -0400
+++ linux-2.6.7-07-file_ctx2/fs/nfs/write.c	2004-06-06 13:13:29.000000000 -0400
@@ -191,8 +191,7 @@ static int nfs_writepage_sync(struct nfs
 	wdata->cred = ctx->cred;
 	wdata->inode = inode;
 	wdata->args.fh = NFS_FH(inode);
-	wdata->args.lockowner = ctx->lockowner;
-	wdata->args.state = ctx->state;
+	wdata->args.context = ctx;
 	wdata->args.pages = &page;
 	wdata->args.stable = NFS_FILE_SYNC;
 	wdata->args.pgbase = offset;
@@ -876,8 +875,7 @@ static void nfs_write_rpcsetup(struct nf
 	data->args.pgbase = req->wb_pgbase + offset;
 	data->args.pages  = data->pagevec;
 	data->args.count  = count;
-	data->args.lockowner = req->wb_context->lockowner;
-	data->args.state  = req->wb_context->state;
+	data->args.context = req->wb_context;
 
 	data->res.fattr   = &data->fattr;
 	data->res.count   = count;
diff -u --recursive --new-file --show-c-function linux-2.6.7-06-file_ctx/include/linux/nfs_xdr.h linux-2.6.7-07-file_ctx2/include/linux/nfs_xdr.h
--- linux-2.6.7-06-file_ctx/include/linux/nfs_xdr.h	2004-06-06 13:11:35.000000000 -0400
+++ linux-2.6.7-07-file_ctx2/include/linux/nfs_xdr.h	2004-06-06 13:11:40.000000000 -0400
@@ -235,8 +235,7 @@ struct nfs_lockres {
 
 struct nfs_readargs {
 	struct nfs_fh *		fh;
-	fl_owner_t		lockowner;
-	struct nfs4_state *	state;
+	struct nfs_open_context *context;
 	__u64			offset;
 	__u32			count;
 	unsigned int		pgbase;
@@ -259,8 +258,7 @@ struct nfs_readres {
 
 struct nfs_writeargs {
 	struct nfs_fh *		fh;
-	fl_owner_t		lockowner;
-	struct nfs4_state *	state;
+	struct nfs_open_context *context;
 	__u64			offset;
 	__u32			count;
 	enum nfs3_stable_how	stable;