Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / sunrpc / clnt.h

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 2814a8e..27b081f 100644 (file)
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -45,11 +45,11 @@ struct rpc_clnt {
        char *                  cl_server;      /* server machine name */
        char *                  cl_protname;    /* protocol name */
        struct rpc_auth *       cl_auth;        /* authenticator */
-       struct rpc_stat *       cl_stats;       /* statistics */
+       struct rpc_stat *       cl_stats;       /* per-program statistics */
+       struct rpc_iostats *    cl_metrics;     /* per-client statistics */
 
        unsigned int            cl_softrtry : 1,/* soft timeouts */
                                cl_intr     : 1,/* interruptible */
-                               cl_chatty   : 1,/* be verbose */
                                cl_autobind : 1,/* use getport() */
                                cl_oneshot  : 1,/* dispose after use */
                                cl_dead     : 1,/* abandoned */
@@ -61,6 +61,7 @@ struct rpc_clnt {
        int                     cl_nodelen;     /* nodename length */
        char                    cl_nodename[UNX_MAXNODENAME];
        char                    cl_pathname[30];/* Path in rpc_pipe_fs */
+       struct vfsmount *       cl_vfsmnt;
        struct dentry *         cl_dentry;      /* inode */
        struct rpc_clnt *       cl_parent;      /* Points to parent of clones */
        struct rpc_rtt          cl_rtt_default;
@@ -102,6 +103,8 @@ struct rpc_procinfo {
        unsigned int            p_bufsiz;       /* req. buffer size */
        unsigned int            p_count;        /* call count */
        unsigned int            p_timer;        /* Which RTT timer to use */
+       u32                     p_statidx;      /* Which procedure to account */
+       char *                  p_name;         /* name of procedure */
 };
 
 #define RPC_CONGESTED(clnt)    (RPCXPRT_CONGESTED((clnt)->cl_xprt))
@@ -112,6 +115,11 @@ struct rpc_procinfo {
 struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,
                                struct rpc_program *info,
                                u32 version, rpc_authflavor_t authflavor);
+struct rpc_clnt *rpc_new_client(struct rpc_xprt *xprt, char *servname,
+                               struct rpc_program *info,
+                               u32 version, rpc_authflavor_t authflavor);
+struct rpc_clnt        *rpc_bind_new_program(struct rpc_clnt *,
+                               struct rpc_program *, int);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
 int            rpc_shutdown_client(struct rpc_clnt *);
 int            rpc_destroy_client(struct rpc_clnt *);
@@ -122,7 +130,8 @@ int         rpc_register(u32, u32, int, unsigned short, int *);
 void           rpc_call_setup(struct rpc_task *, struct rpc_message *, int);
 
 int            rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg,
-                              int flags, rpc_action callback, void *clntdata);
+                              int flags, const struct rpc_call_ops *tk_ops,
+                              void *calldata);
 int            rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg,
                              int flags);
 void           rpc_restart_call(struct rpc_task *);
@@ -130,20 +139,8 @@ void               rpc_clnt_sigmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void           rpc_clnt_sigunmask(struct rpc_clnt *clnt, sigset_t *oldset);
 void           rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 size_t         rpc_max_payload(struct rpc_clnt *);
-
-static __inline__
-int rpc_call(struct rpc_clnt *clnt, u32 proc, void *argp, void *resp, int flags)
-{
-       struct rpc_message msg = {
-               .rpc_proc       = &clnt->cl_procinfo[proc],
-               .rpc_argp       = argp,
-               .rpc_resp       = resp,
-               .rpc_cred       = NULL
-       };
-       return rpc_call_sync(clnt, &msg, flags);
-}
-               
-extern void rpciod_wake_up(void);
+void           rpc_force_rebind(struct rpc_clnt *);
+int            rpc_ping(struct rpc_clnt *clnt, int flags);
 
 /*
  * Helper function for NFSroot support