Skip to content

L
linux
Commit e07ebea0 authored by Hong zhi guo's avatar Hong zhi guo Committed by David S. Miller
Browse files
Options

scsi: replace obsolete NLMSG_* with type safe nlmsg_* 

Signed-off-by: default avatarHong Zhiguo <honkiko@gmail.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b96dc464
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 50 deletions
drivers/scsi/scsi_netlink.c
View file @ e07ebea0
...@@ -50,7 +50,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) ...@@ -50,7 +50,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
u32 rlen; u32 rlen;
int err, tport; int err, tport;
while (skb->len >= NLMSG_SPACE(0)) { while (skb->len >= NLMSG_HDRLEN) {
err = 0; err = 0;
nlh = nlmsg_hdr(skb); nlh = nlmsg_hdr(skb);
...@@ -70,7 +70,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) ...@@ -70,7 +70,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
goto next_msg; goto next_msg;
} }
hdr = NLMSG_DATA(nlh); hdr = nlmsg_data(nlh);
if ((hdr->version != SCSI_NL_VERSION) || if ((hdr->version != SCSI_NL_VERSION) ||
(hdr->magic != SCSI_NL_MAGIC)) { (hdr->magic != SCSI_NL_MAGIC)) {
err = -EPROTOTYPE; err = -EPROTOTYPE;
......
drivers/scsi/scsi_transport_fc.c
View file @ e07ebea0
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <scsi/scsi_transport.h> #include <scsi/scsi_transport.h>
#include <scsi/scsi_transport_fc.h> #include <scsi/scsi_transport_fc.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <linux/netlink.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <scsi/scsi_netlink_fc.h> #include <scsi/scsi_netlink_fc.h>
#include <scsi/scsi_bsg_fc.h> #include <scsi/scsi_bsg_fc.h>
...@@ -534,7 +533,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, ...@@ -534,7 +533,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct fc_nl_event *event; struct fc_nl_event *event;
const char *name; const char *name;
u32 len, skblen; u32 len;
int err; int err;
if (!scsi_nl_sock) { if (!scsi_nl_sock) {
...@@ -543,21 +542,19 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, ...@@ -543,21 +542,19 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
} }
len = FC_NL_MSGALIGN(sizeof(*event)); len = FC_NL_MSGALIGN(sizeof(*event));
skblen = NLMSG_SPACE(len);
skb = alloc_skb(skblen, GFP_KERNEL); skb = nlmsg_new(len, GFP_KERNEL);
if (!skb) { if (!skb) {
err = -ENOBUFS; err = -ENOBUFS;
goto send_fail; goto send_fail;
} }
nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
skblen - sizeof(*nlh), 0);
if (!nlh) { if (!nlh) {
err = -ENOBUFS; err = -ENOBUFS;
goto send_fail_skb; goto send_fail_skb;
} }
event = NLMSG_DATA(nlh); event = nlmsg_data(nlh);
INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
FC_NL_ASYNC_EVENT, len); FC_NL_ASYNC_EVENT, len);
...@@ -604,7 +601,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, ...@@ -604,7 +601,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct fc_nl_event *event; struct fc_nl_event *event;
u32 len, skblen; u32 len;
int err; int err;
if (!scsi_nl_sock) { if (!scsi_nl_sock) {
...@@ -613,21 +610,19 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, ...@@ -613,21 +610,19 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
} }
len = FC_NL_MSGALIGN(sizeof(*event) + data_len); len = FC_NL_MSGALIGN(sizeof(*event) + data_len);
skblen = NLMSG_SPACE(len);
skb = alloc_skb(skblen, GFP_KERNEL); skb = nlmsg_new(len, GFP_KERNEL);
if (!skb) { if (!skb) {
err = -ENOBUFS; err = -ENOBUFS;
goto send_vendor_fail; goto send_vendor_fail;
} }
nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
skblen - sizeof(*nlh), 0);
if (!nlh) { if (!nlh) {
err = -ENOBUFS; err = -ENOBUFS;
goto send_vendor_fail_skb; goto send_vendor_fail_skb;
} }
event = NLMSG_DATA(nlh); event = nlmsg_data(nlh);
INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC, INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
FC_NL_ASYNC_EVENT, len); FC_NL_ASYNC_EVENT, len);
......
drivers/scsi/scsi_transport_iscsi.c
View file @ e07ebea0
...@@ -1344,8 +1344,8 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, ...@@ -1344,8 +1344,8 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
char *pdu; char *pdu;
struct iscsi_internal *priv; struct iscsi_internal *priv;
int len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) + int len = nlmsg_total_size(sizeof(*ev) + sizeof(struct iscsi_hdr) +
data_size); data_size);
priv = iscsi_if_transport_lookup(conn->transport); priv = iscsi_if_transport_lookup(conn->transport);
if (!priv) if (!priv)
...@@ -1360,7 +1360,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr, ...@@ -1360,7 +1360,7 @@ int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
memset(ev, 0, sizeof(*ev)); memset(ev, 0, sizeof(*ev));
ev->transport_handle = iscsi_handle(conn->transport); ev->transport_handle = iscsi_handle(conn->transport);
ev->type = ISCSI_KEVENT_RECV_PDU; ev->type = ISCSI_KEVENT_RECV_PDU;
...@@ -1381,7 +1381,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost, ...@@ -1381,7 +1381,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct sk_buff *skb; struct sk_buff *skb;
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
int len = NLMSG_SPACE(sizeof(*ev) + data_size); int len = nlmsg_total_size(sizeof(*ev) + data_size);
skb = alloc_skb(len, GFP_ATOMIC); skb = alloc_skb(len, GFP_ATOMIC);
if (!skb) { if (!skb) {
...@@ -1390,7 +1390,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost, ...@@ -1390,7 +1390,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
memset(ev, 0, sizeof(*ev)); memset(ev, 0, sizeof(*ev));
ev->type = type; ev->type = type;
ev->transport_handle = iscsi_handle(transport); ev->transport_handle = iscsi_handle(transport);
...@@ -1415,7 +1415,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error) ...@@ -1415,7 +1415,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)
struct sk_buff *skb; struct sk_buff *skb;
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
struct iscsi_internal *priv; struct iscsi_internal *priv;
int len = NLMSG_SPACE(sizeof(*ev)); int len = nlmsg_total_size(sizeof(*ev));
priv = iscsi_if_transport_lookup(conn->transport); priv = iscsi_if_transport_lookup(conn->transport);
if (!priv) if (!priv)
...@@ -1429,7 +1429,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error) ...@@ -1429,7 +1429,7 @@ void iscsi_conn_error_event(struct iscsi_cls_conn *conn, enum iscsi_err error)
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
ev->transport_handle = iscsi_handle(conn->transport); ev->transport_handle = iscsi_handle(conn->transport);
ev->type = ISCSI_KEVENT_CONN_ERROR; ev->type = ISCSI_KEVENT_CONN_ERROR;
ev->r.connerror.error = error; ev->r.connerror.error = error;
...@@ -1450,7 +1450,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn, ...@@ -1450,7 +1450,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn,
struct sk_buff *skb; struct sk_buff *skb;
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
struct iscsi_internal *priv; struct iscsi_internal *priv;
int len = NLMSG_SPACE(sizeof(*ev)); int len = nlmsg_total_size(sizeof(*ev));
priv = iscsi_if_transport_lookup(conn->transport); priv = iscsi_if_transport_lookup(conn->transport);
if (!priv) if (!priv)
...@@ -1464,7 +1464,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn, ...@@ -1464,7 +1464,7 @@ void iscsi_conn_login_event(struct iscsi_cls_conn *conn,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
ev->transport_handle = iscsi_handle(conn->transport); ev->transport_handle = iscsi_handle(conn->transport);
ev->type = ISCSI_KEVENT_CONN_LOGIN_STATE; ev->type = ISCSI_KEVENT_CONN_LOGIN_STATE;
ev->r.conn_login.state = state; ev->r.conn_login.state = state;
...@@ -1484,7 +1484,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport, ...@@ -1484,7 +1484,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport,
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct sk_buff *skb; struct sk_buff *skb;
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
int len = NLMSG_SPACE(sizeof(*ev) + data_size); int len = nlmsg_total_size(sizeof(*ev) + data_size);
skb = alloc_skb(len, GFP_NOIO); skb = alloc_skb(len, GFP_NOIO);
if (!skb) { if (!skb) {
...@@ -1494,7 +1494,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport, ...@@ -1494,7 +1494,7 @@ void iscsi_post_host_event(uint32_t host_no, struct iscsi_transport *transport,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
ev->transport_handle = iscsi_handle(transport); ev->transport_handle = iscsi_handle(transport);
ev->type = ISCSI_KEVENT_HOST_EVENT; ev->type = ISCSI_KEVENT_HOST_EVENT;
ev->r.host_event.host_no = host_no; ev->r.host_event.host_no = host_no;
...@@ -1515,7 +1515,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport, ...@@ -1515,7 +1515,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport,
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
struct sk_buff *skb; struct sk_buff *skb;
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
int len = NLMSG_SPACE(sizeof(*ev) + data_size); int len = nlmsg_total_size(sizeof(*ev) + data_size);
skb = alloc_skb(len, GFP_NOIO); skb = alloc_skb(len, GFP_NOIO);
if (!skb) { if (!skb) {
...@@ -1524,7 +1524,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport, ...@@ -1524,7 +1524,7 @@ void iscsi_ping_comp_event(uint32_t host_no, struct iscsi_transport *transport,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
ev->transport_handle = iscsi_handle(transport); ev->transport_handle = iscsi_handle(transport);
ev->type = ISCSI_KEVENT_PING_COMP; ev->type = ISCSI_KEVENT_PING_COMP;
ev->r.ping_comp.host_no = host_no; ev->r.ping_comp.host_no = host_no;
...@@ -1543,7 +1543,7 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi, ...@@ -1543,7 +1543,7 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
int len = NLMSG_SPACE(size); int len = nlmsg_total_size(size);
int flags = multi ? NLM_F_MULTI : 0; int flags = multi ? NLM_F_MULTI : 0;
int t = done ? NLMSG_DONE : type; int t = done ? NLMSG_DONE : type;
...@@ -1555,24 +1555,24 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi, ...@@ -1555,24 +1555,24 @@ iscsi_if_send_reply(uint32_t group, int seq, int type, int done, int multi,
nlh = __nlmsg_put(skb, 0, 0, t, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, t, (len - sizeof(*nlh)), 0);
nlh->nlmsg_flags = flags; nlh->nlmsg_flags = flags;
memcpy(NLMSG_DATA(nlh), payload, size); memcpy(nlmsg_data(nlh), payload, size);
return iscsi_multicast_skb(skb, group, GFP_ATOMIC); return iscsi_multicast_skb(skb, group, GFP_ATOMIC);
} }
static int static int
iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
{ {
struct iscsi_uevent *ev = NLMSG_DATA(nlh); struct iscsi_uevent *ev = nlmsg_data(nlh);
struct iscsi_stats *stats; struct iscsi_stats *stats;
struct sk_buff *skbstat; struct sk_buff *skbstat;
struct iscsi_cls_conn *conn; struct iscsi_cls_conn *conn;
struct nlmsghdr *nlhstat; struct nlmsghdr *nlhstat;
struct iscsi_uevent *evstat; struct iscsi_uevent *evstat;
struct iscsi_internal *priv; struct iscsi_internal *priv;
int len = NLMSG_SPACE(sizeof(*ev) + int len = nlmsg_total_size(sizeof(*ev) +
sizeof(struct iscsi_stats) + sizeof(struct iscsi_stats) +
sizeof(struct iscsi_stats_custom) * sizeof(struct iscsi_stats_custom) *
ISCSI_STATS_CUSTOM_MAX); ISCSI_STATS_CUSTOM_MAX);
int err = 0; int err = 0;
priv = iscsi_if_transport_lookup(transport); priv = iscsi_if_transport_lookup(transport);
...@@ -1595,7 +1595,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) ...@@ -1595,7 +1595,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
nlhstat = __nlmsg_put(skbstat, 0, 0, 0, nlhstat = __nlmsg_put(skbstat, 0, 0, 0,
(len - sizeof(*nlhstat)), 0); (len - sizeof(*nlhstat)), 0);
evstat = NLMSG_DATA(nlhstat); evstat = nlmsg_data(nlhstat);
memset(evstat, 0, sizeof(*evstat)); memset(evstat, 0, sizeof(*evstat));
evstat->transport_handle = iscsi_handle(conn->transport); evstat->transport_handle = iscsi_handle(conn->transport);
evstat->type = nlh->nlmsg_type; evstat->type = nlh->nlmsg_type;
...@@ -1608,12 +1608,12 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) ...@@ -1608,12 +1608,12 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
memset(stats, 0, sizeof(*stats)); memset(stats, 0, sizeof(*stats));
transport->get_stats(conn, stats); transport->get_stats(conn, stats);
actual_size = NLMSG_SPACE(sizeof(struct iscsi_uevent) + actual_size = nlmsg_total_size(sizeof(struct iscsi_uevent) +
sizeof(struct iscsi_stats) + sizeof(struct iscsi_stats) +
sizeof(struct iscsi_stats_custom) * sizeof(struct iscsi_stats_custom) *
stats->custom_length); stats->custom_length);
actual_size -= sizeof(*nlhstat); actual_size -= sizeof(*nlhstat);
actual_size = NLMSG_LENGTH(actual_size); actual_size = nlmsg_msg_size(actual_size);
skb_trim(skbstat, NLMSG_ALIGN(actual_size)); skb_trim(skbstat, NLMSG_ALIGN(actual_size));
nlhstat->nlmsg_len = actual_size; nlhstat->nlmsg_len = actual_size;
...@@ -1637,7 +1637,7 @@ int iscsi_session_event(struct iscsi_cls_session *session, ...@@ -1637,7 +1637,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
struct iscsi_uevent *ev; struct iscsi_uevent *ev;
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
int rc, len = NLMSG_SPACE(sizeof(*ev)); int rc, len = nlmsg_total_size(sizeof(*ev));
priv = iscsi_if_transport_lookup(session->transport); priv = iscsi_if_transport_lookup(session->transport);
if (!priv) if (!priv)
...@@ -1653,7 +1653,7 @@ int iscsi_session_event(struct iscsi_cls_session *session, ...@@ -1653,7 +1653,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
} }
nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0); nlh = __nlmsg_put(skb, 0, 0, 0, (len - sizeof(*nlh)), 0);
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
ev->transport_handle = iscsi_handle(session->transport); ev->transport_handle = iscsi_handle(session->transport);
ev->type = event; ev->type = event;
...@@ -2005,7 +2005,7 @@ iscsi_send_ping(struct iscsi_transport *transport, struct iscsi_uevent *ev) ...@@ -2005,7 +2005,7 @@ iscsi_send_ping(struct iscsi_transport *transport, struct iscsi_uevent *ev)
static int static int
iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh) iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
{ {
struct iscsi_uevent *ev = NLMSG_DATA(nlh); struct iscsi_uevent *ev = nlmsg_data(nlh);
struct Scsi_Host *shost = NULL; struct Scsi_Host *shost = NULL;
struct iscsi_chap_rec *chap_rec; struct iscsi_chap_rec *chap_rec;
struct iscsi_internal *priv; struct iscsi_internal *priv;
...@@ -2024,7 +2024,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh) ...@@ -2024,7 +2024,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
return -EINVAL; return -EINVAL;
chap_buf_size = (ev->u.get_chap.num_entries * sizeof(*chap_rec)); chap_buf_size = (ev->u.get_chap.num_entries * sizeof(*chap_rec));
len = NLMSG_SPACE(sizeof(*ev) + chap_buf_size); len = nlmsg_total_size(sizeof(*ev) + chap_buf_size);
shost = scsi_host_lookup(ev->u.get_chap.host_no); shost = scsi_host_lookup(ev->u.get_chap.host_no);
if (!shost) { if (!shost) {
...@@ -2045,7 +2045,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh) ...@@ -2045,7 +2045,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
nlhchap = __nlmsg_put(skbchap, 0, 0, 0, nlhchap = __nlmsg_put(skbchap, 0, 0, 0,
(len - sizeof(*nlhchap)), 0); (len - sizeof(*nlhchap)), 0);
evchap = NLMSG_DATA(nlhchap); evchap = nlmsg_data(nlhchap);
memset(evchap, 0, sizeof(*evchap)); memset(evchap, 0, sizeof(*evchap));
evchap->transport_handle = iscsi_handle(transport); evchap->transport_handle = iscsi_handle(transport);
evchap->type = nlh->nlmsg_type; evchap->type = nlh->nlmsg_type;
...@@ -2058,7 +2058,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh) ...@@ -2058,7 +2058,7 @@ iscsi_get_chap(struct iscsi_transport *transport, struct nlmsghdr *nlh)
err = transport->get_chap(shost, ev->u.get_chap.chap_tbl_idx, err = transport->get_chap(shost, ev->u.get_chap.chap_tbl_idx,
&evchap->u.get_chap.num_entries, buf); &evchap->u.get_chap.num_entries, buf);
actual_size = NLMSG_SPACE(sizeof(*ev) + chap_buf_size); actual_size = nlmsg_total_size(sizeof(*ev) + chap_buf_size);
skb_trim(skbchap, NLMSG_ALIGN(actual_size)); skb_trim(skbchap, NLMSG_ALIGN(actual_size));
nlhchap->nlmsg_len = actual_size; nlhchap->nlmsg_len = actual_size;
...@@ -2096,7 +2096,7 @@ static int ...@@ -2096,7 +2096,7 @@ static int
iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)
{ {
int err = 0; int err = 0;
struct iscsi_uevent *ev = NLMSG_DATA(nlh); struct iscsi_uevent *ev = nlmsg_data(nlh);
struct iscsi_transport *transport = NULL; struct iscsi_transport *transport = NULL;
struct iscsi_internal *priv; struct iscsi_internal *priv;
struct iscsi_cls_session *session; struct iscsi_cls_session *session;
...@@ -2263,7 +2263,7 @@ static void ...@@ -2263,7 +2263,7 @@ static void
iscsi_if_rx(struct sk_buff *skb) iscsi_if_rx(struct sk_buff *skb)
{ {
mutex_lock(&rx_queue_mutex); mutex_lock(&rx_queue_mutex);
while (skb->len >= NLMSG_SPACE(0)) { while (skb->len >= NLMSG_HDRLEN) {
int err; int err;
uint32_t rlen; uint32_t rlen;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
...@@ -2276,7 +2276,7 @@ iscsi_if_rx(struct sk_buff *skb) ...@@ -2276,7 +2276,7 @@ iscsi_if_rx(struct sk_buff *skb)
break; break;
} }
ev = NLMSG_DATA(nlh); ev = nlmsg_data(nlh);
rlen = NLMSG_ALIGN(nlh->nlmsg_len); rlen = NLMSG_ALIGN(nlh->nlmsg_len);
if (rlen > skb->len) if (rlen > skb->len)
rlen = skb->len; rlen = skb->len;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7