Commit 9fbf9201 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: lnet: change lnet_acceptor_connreq_t to proper structure

Change lnet_acceptor_connreq_t from typedef to proper structure.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24566Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ea8f9aa
...@@ -228,11 +228,11 @@ typedef struct { ...@@ -228,11 +228,11 @@ typedef struct {
#define LNET_PROTO_TCP_VERSION_MINOR 0 #define LNET_PROTO_TCP_VERSION_MINOR 0
/* Acceptor connection request */ /* Acceptor connection request */
typedef struct { struct lnet_acceptor_connreq {
__u32 acr_magic; /* PTL_ACCEPTOR_PROTO_MAGIC */ __u32 acr_magic; /* PTL_ACCEPTOR_PROTO_MAGIC */
__u32 acr_version; /* protocol version */ __u32 acr_version; /* protocol version */
__u64 acr_nid; /* target NID */ __u64 acr_nid; /* target NID */
} WIRE_ATTR lnet_acceptor_connreq_t; } WIRE_ATTR;
#define LNET_PROTO_ACCEPTOR_VERSION 1 #define LNET_PROTO_ACCEPTOR_VERSION 1
......
...@@ -143,7 +143,7 @@ int ...@@ -143,7 +143,7 @@ int
lnet_connect(struct socket **sockp, lnet_nid_t peer_nid, lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
__u32 local_ip, __u32 peer_ip, int peer_port) __u32 local_ip, __u32 peer_ip, int peer_port)
{ {
lnet_acceptor_connreq_t cr; struct lnet_acceptor_connreq cr;
struct socket *sock; struct socket *sock;
int rc; int rc;
int port; int port;
...@@ -206,7 +206,7 @@ EXPORT_SYMBOL(lnet_connect); ...@@ -206,7 +206,7 @@ EXPORT_SYMBOL(lnet_connect);
static int static int
lnet_accept(struct socket *sock, __u32 magic) lnet_accept(struct socket *sock, __u32 magic)
{ {
lnet_acceptor_connreq_t cr; struct lnet_acceptor_connreq cr;
__u32 peer_ip; __u32 peer_ip;
int peer_port; int peer_port;
int rc; int rc;
...@@ -284,7 +284,7 @@ lnet_accept(struct socket *sock, __u32 magic) ...@@ -284,7 +284,7 @@ lnet_accept(struct socket *sock, __u32 magic)
rc = lnet_sock_read(sock, &cr.acr_nid, rc = lnet_sock_read(sock, &cr.acr_nid,
sizeof(cr) - sizeof(cr) -
offsetof(lnet_acceptor_connreq_t, acr_nid), offsetof(struct lnet_acceptor_connreq, acr_nid),
accept_timeout); accept_timeout);
if (rc) { if (rc) {
CERROR("Error %d reading connection request from %pI4h\n", CERROR("Error %d reading connection request from %pI4h\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment