NFSv4: More cleanups of the NFSv4 state.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 080e3e7b6c07fcbc9c939efb628b3cd8fe57a692..21c3c4d396becd1c575bab082136813660d719f3 100644 (file)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -130,8 +130,7 @@ nfs_direct_read_seg(struct inode *inode, struct nfs_open_context *ctx,
                .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, struct nfs_open_context *ctx,
                .cred           = ctx->cred,
                .args           = {
                        .fh             = NFS_FH(inode),
-                       .lockowner      = ctx->lockowner,
-                       .state          = ctx->state,
+                       .context        = ctx,
                },
                .res            = {
                        .fattr          = &wdata.fattr,

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 4988e501603a022068a087a8386ce6d72d0adc9a..8eb1b2faa3270e868e9d2f1465ae1a17d6be0ced 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -912,15 +912,15 @@ static int encode_putrootfh(struct xdr_stream *xdr)
         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));
@@ -933,7 +933,7 @@ static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args)
        RESERVE_SPACE(4);
        WRITE32(OP_READ);
 
-       encode_stateid(xdr, args->state, args->lockowner);
+       encode_stateid(xdr, args->context);
 
        RESERVE_SPACE(12);
        WRITE64(args->offset);
@@ -1092,7 +1092,7 @@ static int encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args
        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 --git a/fs/nfs/read.c b/fs/nfs/read.c
index 54df1a48843d1b3e62d2feeb8508003d2bf297d0..0de2e2d120154a9cfaafcecb932699945edf69f9 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -109,8 +109,7 @@ static int nfs_readpage_sync(struct nfs_open_context *ctx, struct inode *inode,
        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_page *req, struct nfs_read_data *data,
        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 --git a/fs/nfs/write.c b/fs/nfs/write.c
index c956b6f9b1d0fb6e58ec3baa8bef3bebd3f0e03d..daea97848193b3c51b5e0ac01d04c29bc91d3cc8 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -191,8 +191,7 @@ static int nfs_writepage_sync(struct nfs_open_context *ctx, struct inode *inode,
        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;
@@ -874,8 +873,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
        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 --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 340ff5c8f3df0f06faf61c9eb846f070f576a24a..3f19c949074f1ccb2e7bde7659bea549c03c4df4 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -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;