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

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 7024230f0d1db2f2b464ddd1c79a764e389f437e..c2045a2a9d0f88f3f520e75976af127277349409 100644 (file)
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -67,7 +67,8 @@ struct nfs4_minor_version_ops {
        void    (*free_lock_state)(struct nfs_server *,
                        struct nfs4_lock_state *);
        int     (*test_and_free_expired)(struct nfs_server *,
-                       nfs4_stateid *, const struct cred *);
+                                        const nfs4_stateid *,
+                                        const struct cred *);
        struct nfs_seqid *
                (*alloc_seqid)(struct nfs_seqid_counter *, gfp_t);
        void    (*session_trunk)(struct rpc_clnt *clnt,

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 26758acba3a665eecf020ddb102df3d84cdff644..db585a6a8f0d0fabdbb918597be7e7fa2b29dc83 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -103,10 +103,10 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp,
                const struct cred *cred,
                struct nfs4_slot *slot,
                bool is_privileged);
-static int nfs41_test_stateid(struct nfs_server *, nfs4_stateid *,
-               const struct cred *);
+static int nfs41_test_stateid(struct nfs_server *, const nfs4_stateid *,
+                             const struct cred *);
 static int nfs41_free_stateid(struct nfs_server *, const nfs4_stateid *,
-               const struct cred *, bool);
+                             const struct cred *, bool);
 #endif
 
 #ifdef CONFIG_NFS_V4_SECURITY_LABEL
@@ -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,
-               nfs4_stateid *stateid,
-               const struct cred *cred)
+                                              const nfs4_stateid *stateid,
+                                              const struct cred *cred)
 {
        return -NFS4ERR_BAD_STATEID;
 }
 
 #if defined(CONFIG_NFS_V4_1)
 static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,
-               nfs4_stateid *stateid,
-               const struct cred *cred)
+                                              const nfs4_stateid *stateid,
+                                              const struct cred *cred)
 {
        int status;
 
@@ -10386,12 +10386,12 @@ out:
 }
 
 static int _nfs41_test_stateid(struct nfs_server *server,
-               nfs4_stateid *stateid,
-               const struct cred *cred)
+                              const nfs4_stateid *stateid,
+                              const struct cred *cred)
 {
        int status;
        struct nfs41_test_stateid_args args = {
-               .stateid = stateid,
+               .stateid = *stateid,
        };
        struct nfs41_test_stateid_res res;
        struct rpc_message msg = {
@@ -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.
  */
 static int nfs41_test_stateid(struct nfs_server *server,
-               nfs4_stateid *stateid,
-               const struct cred *cred)
+                             const nfs4_stateid *stateid,
+                             const struct cred *cred)
 {
        struct nfs4_exception exception = {
                .interruptible = true,

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 98aab2c324c91a4ec91bbd5a928e8a76e03f613f..4bf7d5c092826f46f9bd28a42fe615ed5c4dd900 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -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_uint32(xdr, 1);
-       encode_nfs4_stateid(xdr, args->stateid);
+       encode_nfs4_stateid(xdr, &args->stateid);
 }
 
 static void encode_free_stateid(struct xdr_stream *xdr,

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 01efacae46344a22bfb723dccf01709ffb3f7a8a..45623af3e7b810039943299e1ee061d37579f35d 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1438,7 +1438,7 @@ struct nfs41_secinfo_no_name_args {
 
 struct nfs41_test_stateid_args {
        struct nfs4_sequence_args       seq_args;
-       nfs4_stateid                    *stateid;
+       nfs4_stateid                    stateid;
 };
 
 struct nfs41_test_stateid_res {