Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6142 lnet: remove most of typedefs from LNet headers
[fs/lustre-release.git]
/
lnet
/
lnet
/
acceptor.c
diff --git
a/lnet/lnet/acceptor.c
b/lnet/lnet/acceptor.c
index
8230ceb
..
885cd85
100644
(file)
--- a/
lnet/lnet/acceptor.c
+++ b/
lnet/lnet/acceptor.c
@@
-152,7
+152,7
@@
int
lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
__u32 local_ip, __u32 peer_ip, int peer_port)
{
lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
__u32 local_ip, __u32 peer_ip, int peer_port)
{
-
lnet_acceptor_connreq_t
cr;
+
struct lnet_acceptor_connreq
cr;
struct socket *sock;
int rc;
int port;
struct socket *sock;
int rc;
int port;
@@
-217,12
+217,12
@@
EXPORT_SYMBOL(lnet_connect);
static int
lnet_accept(struct socket *sock, __u32 magic)
{
static int
lnet_accept(struct socket *sock, __u32 magic)
{
-
lnet_acceptor_connreq_t
cr;
+
struct lnet_acceptor_connreq
cr;
__u32 peer_ip;
int peer_port;
int rc;
int flip;
__u32 peer_ip;
int peer_port;
int rc;
int flip;
-
lnet_ni_t
*ni;
+
struct lnet_ni
*ni;
char *str;
LASSERT(sizeof(cr) <= 16); /* not too big for the stack */
char *str;
LASSERT(sizeof(cr) <= 16); /* not too big for the stack */
@@
-299,7
+299,7
@@
lnet_accept(struct socket *sock, __u32 magic)
rc = lnet_sock_read(sock, &cr.acr_nid,
sizeof(cr) -
rc = lnet_sock_read(sock, &cr.acr_nid,
sizeof(cr) -
- offsetof(
lnet_acceptor_connreq_t
, acr_nid),
+ offsetof(
struct lnet_acceptor_connreq
, acr_nid),
accept_timeout);
if (rc != 0) {
CERROR("Error %d reading connection request from "
accept_timeout);
if (rc != 0) {
CERROR("Error %d reading connection request from "