Merge branches 'release' and 'gpe-ack' into release

[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 060508ba358bc3347e0f71c79a1a8e6f644e8bc7..206f092ad4c7dbd09a120352f538141ad9e58977 100644 (file)
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -20,14 +20,6 @@ struct svc_sock {
        struct socket *         sk_sock;        /* berkeley socket layer */
        struct sock *           sk_sk;          /* INET layer */
 
-       atomic_t                sk_reserved;    /* space on outq that is reserved */
-
-       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 */
-
        /* We keep the old state_change and data_ready CB's here */
        void                    (*sk_ostate)(struct sock *);
        void                    (*sk_odata)(struct sock *, int bytes);
@@ -36,14 +28,6 @@ struct svc_sock {
        /* private TCP part */
        int                     sk_reclen;      /* length of record */
        int                     sk_tcplen;      /* current read length */
-       time_t                  sk_lastrecv;    /* time of last received request */
-
-       /* cache of various info for TCP sockets */
-       void                    *sk_info_authunix;
-
-       struct sockaddr_storage sk_local;       /* local address */
-       struct sockaddr_storage sk_remote;      /* remote peer's address */
-       int                     sk_remotelen;   /* length of address */
 };
 
 /*