Commit 924cf3c9 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker

NFSv4.1: constify the stateid argument in nfs41_test_stateid()

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent b8ec59cb
...@@ -67,7 +67,8 @@ struct nfs4_minor_version_ops { ...@@ -67,7 +67,8 @@ struct nfs4_minor_version_ops {
void (*free_lock_state)(struct nfs_server *, void (*free_lock_state)(struct nfs_server *,
struct nfs4_lock_state *); struct nfs4_lock_state *);
int (*test_and_free_expired)(struct nfs_server *, int (*test_and_free_expired)(struct nfs_server *,
nfs4_stateid *, const struct cred *); const nfs4_stateid *,
const struct cred *);
struct nfs_seqid * struct nfs_seqid *
(*alloc_seqid)(struct nfs_seqid_counter *, gfp_t); (*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);
void (*session_trunk)(struct rpc_clnt *clnt, void (*session_trunk)(struct rpc_clnt *clnt,
......
...@@ -103,10 +103,10 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, ...@@ -103,10 +103,10 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp,
const struct cred *cred, const struct cred *cred,
struct nfs4_slot *slot, struct nfs4_slot *slot,
bool is_privileged); bool is_privileged);
static int nfs41_test_stateid(struct nfs_server *, nfs4_stateid *, static int nfs41_test_stateid(struct nfs_server *, const nfs4_stateid *,
const struct cred *); const struct cred *);
static int nfs41_free_stateid(struct nfs_server *, const nfs4_stateid *, static int nfs41_free_stateid(struct nfs_server *, const nfs4_stateid *,
const struct cred *, bool); const struct cred *, bool);
#endif #endif
#ifdef CONFIG_NFS_V4_SECURITY_LABEL #ifdef CONFIG_NFS_V4_SECURITY_LABEL
...@@ -2875,16 +2875,16 @@ static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st ...@@ -2875,16 +2875,16 @@ static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st
} }
static int nfs40_test_and_free_expired_stateid(struct nfs_server *server, static int nfs40_test_and_free_expired_stateid(struct nfs_server *server,
nfs4_stateid *stateid, const nfs4_stateid *stateid,
const struct cred *cred) const struct cred *cred)
{ {
return -NFS4ERR_BAD_STATEID; return -NFS4ERR_BAD_STATEID;
} }
#if defined(CONFIG_NFS_V4_1) #if defined(CONFIG_NFS_V4_1)
static int nfs41_test_and_free_expired_stateid(struct nfs_server *server, static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,
nfs4_stateid *stateid, const nfs4_stateid *stateid,
const struct cred *cred) const struct cred *cred)
{ {
int status; int status;
...@@ -10386,12 +10386,12 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle, ...@@ -10386,12 +10386,12 @@ nfs41_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,
} }
static int _nfs41_test_stateid(struct nfs_server *server, static int _nfs41_test_stateid(struct nfs_server *server,
nfs4_stateid *stateid, const nfs4_stateid *stateid,
const struct cred *cred) const struct cred *cred)
{ {
int status; int status;
struct nfs41_test_stateid_args args = { struct nfs41_test_stateid_args args = {
.stateid = stateid, .stateid = *stateid,
}; };
struct nfs41_test_stateid_res res; struct nfs41_test_stateid_res res;
struct rpc_message msg = { struct rpc_message msg = {
...@@ -10447,8 +10447,8 @@ static void nfs4_handle_delay_or_session_error(struct nfs_server *server, ...@@ -10447,8 +10447,8 @@ static void nfs4_handle_delay_or_session_error(struct nfs_server *server,
* failed or the state ID is not currently valid. * failed or the state ID is not currently valid.
*/ */
static int nfs41_test_stateid(struct nfs_server *server, static int nfs41_test_stateid(struct nfs_server *server,
nfs4_stateid *stateid, const nfs4_stateid *stateid,
const struct cred *cred) const struct cred *cred)
{ {
struct nfs4_exception exception = { struct nfs4_exception exception = {
.interruptible = true, .interruptible = true,
......
...@@ -2137,7 +2137,7 @@ static void encode_test_stateid(struct xdr_stream *xdr, ...@@ -2137,7 +2137,7 @@ static void encode_test_stateid(struct xdr_stream *xdr,
{ {
encode_op_hdr(xdr, OP_TEST_STATEID, decode_test_stateid_maxsz, hdr); encode_op_hdr(xdr, OP_TEST_STATEID, decode_test_stateid_maxsz, hdr);
encode_uint32(xdr, 1); encode_uint32(xdr, 1);
encode_nfs4_stateid(xdr, args->stateid); encode_nfs4_stateid(xdr, &args->stateid);
} }
static void encode_free_stateid(struct xdr_stream *xdr, static void encode_free_stateid(struct xdr_stream *xdr,
......
...@@ -1438,7 +1438,7 @@ struct nfs41_secinfo_no_name_args { ...@@ -1438,7 +1438,7 @@ struct nfs41_secinfo_no_name_args {
struct nfs41_test_stateid_args { struct nfs41_test_stateid_args {
struct nfs4_sequence_args seq_args; struct nfs4_sequence_args seq_args;
nfs4_stateid *stateid; nfs4_stateid stateid;
}; };
struct nfs41_test_stateid_res { struct nfs41_test_stateid_res {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment