SUNRPC: Remove the tk_auth macro...

[linux-2.6-omap-h63xx.git] / include / linux / sunrpc / svcsock.h

diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index db312a1e2eebc70bca97465b0e28c5f6a7056bf6..e21dd93ac4b7c3a197f8b1d843d2afbddadc8ff0 100644 (file)
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -37,7 +37,8 @@ struct svc_sock {
 
        atomic_t                sk_reserved;    /* space on outq that is reserved */
 
-       spinlock_t              sk_defer_lock;  /* protects sk_deferred */
+       spinlock_t              sk_lock;        /* protects sk_deferred and
+                                                * sk_info_authunix */
        struct list_head        sk_deferred;    /* deferred requests that need to
                                                 * be revisted */
        struct mutex            sk_mutex;       /* to serialize sending data */
@@ -57,13 +58,16 @@ struct svc_sock {
 
        /* cache of various info for TCP sockets */
        void                    *sk_info_authunix;
+
+       struct sockaddr_storage sk_remote;      /* remote peer's address */
+       int                     sk_remotelen;   /* length of address */
 };
 
 /*
  * Function prototypes.
  */
-int            svc_makesock(struct svc_serv *, int, unsigned short);
-void           svc_close_socket(struct svc_sock *);
+int            svc_makesock(struct svc_serv *, int, unsigned short, int flags);
+void           svc_force_close_socket(struct svc_sock *);
 int            svc_recv(struct svc_rqst *, long);
 int            svc_send(struct svc_rqst *);
 void           svc_drop(struct svc_rqst *);
@@ -74,4 +78,11 @@ int          svc_addsock(struct svc_serv *serv,
                            char *name_return,
                            int *proto);
 
+/*
+ * svc_makesock socket characteristics
+ */
+#define SVC_SOCK_DEFAULTS      (0U)
+#define SVC_SOCK_ANONYMOUS     (1U << 0)       /* don't register with pmap */
+#define SVC_SOCK_TEMPORARY     (1U << 1)       /* flag socket as temporary */
+
 #endif /* SUNRPC_SVCSOCK_H */