Merge tag 'nfsd-5.5' of git://linux-nfs.org/~bfields/linux

[linux-2.6-microblaze.git] / include / linux / sunrpc / xprt.h

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index d783e15..e64bd82 100644 (file)
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -19,8 +19,6 @@
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/msg_prot.h>
 
-#ifdef __KERNEL__
-
 #define RPC_MIN_SLOT_TABLE     (2U)
 #define RPC_DEF_SLOT_TABLE     (16U)
 #define RPC_MAX_SLOT_TABLE_LIMIT       (65536U)
@@ -207,7 +205,8 @@ struct rpc_xprt {
        unsigned int            min_reqs;       /* min number of slots */
        unsigned int            num_reqs;       /* total slots */
        unsigned long           state;          /* transport state */
-       unsigned char           resvport   : 1; /* use a reserved port */
+       unsigned char           resvport   : 1, /* use a reserved port */
+                               reuseport  : 1; /* reuse port on reconnect */
        atomic_t                swapper;        /* we're swapping over this
                                                   transport */
        unsigned int            bind_index;     /* bind function index */
@@ -505,6 +504,4 @@ static inline void xprt_inject_disconnect(struct rpc_xprt *xprt)
 }
 #endif
 
-#endif /* __KERNEL__*/
-
 #endif /* _LINUX_SUNRPC_XPRT_H */