Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / include / linux / sunrpc / clnt.h

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 6095ecba0ddee9193ae1a96ecf21bf903584c52b..55ef67bea06b99a4bb1684802b6e3b8adf70a468 100644 (file)
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -39,7 +39,7 @@ struct rpc_clnt {
        struct list_head        cl_tasks;       /* List of tasks */
        spinlock_t              cl_lock;        /* spinlock */
        struct rpc_xprt __rcu * cl_xprt;        /* transport */
-       struct rpc_procinfo *   cl_procinfo;    /* procedure info */
+       const struct rpc_procinfo *cl_procinfo; /* procedure info */
        u32                     cl_prog,        /* RPC program number */
                                cl_vers,        /* RPC version number */
                                cl_maxproc;     /* max procedure number */
@@ -87,7 +87,8 @@ struct rpc_program {
 struct rpc_version {
        u32                     number;         /* version number */
        unsigned int            nrprocs;        /* number of procs */
-       struct rpc_procinfo *   procs;          /* procedure array */
+       const struct rpc_procinfo *procs;       /* procedure array */
+       unsigned int            *counts;        /* call counts */
 };
 
 /*
@@ -99,7 +100,6 @@ struct rpc_procinfo {
        kxdrdproc_t             p_decode;       /* XDR decode function */
        unsigned int            p_arglen;       /* argument hdr length (u32) */
        unsigned int            p_replen;       /* reply hdr length (u32) */
-       unsigned int            p_count;        /* call count */
        unsigned int            p_timer;        /* Which RTT timer to use */
        u32                     p_statidx;      /* Which procedure to account */
        const char *            p_name;         /* name of procedure */