Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-bionic-kernel.git] / include / linux / sunrpc / xprt.h

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 9d27ac45b909556ada39af3b4f0687b20e6f2d80..8b93ef53df3c95df08625bef6ba58341d583e1e0 100644 (file)
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -347,6 +347,9 @@ void                        xprt_force_disconnect(struct rpc_xprt *xprt);
 void                   xprt_conditional_disconnect(struct rpc_xprt *xprt, unsigned int cookie);
 int                    xs_swapper(struct rpc_xprt *xprt, int enable);
 
+bool                   xprt_lock_connect(struct rpc_xprt *, struct rpc_task *, void *);
+void                   xprt_unlock_connect(struct rpc_xprt *, void *);
+
 /*
  * Reserved bit positions in xprt->state
  */
@@ -357,10 +360,7 @@ int                        xs_swapper(struct rpc_xprt *xprt, int enable);
 #define XPRT_BOUND             (4)
 #define XPRT_BINDING           (5)
 #define XPRT_CLOSING           (6)
-#define XPRT_CONNECTION_ABORT  (7)
-#define XPRT_CONNECTION_CLOSE  (8)
 #define XPRT_CONGESTED         (9)
-#define XPRT_CONNECTION_REUSE  (10)
 
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {