Re: [GIT PATCH] scsi updates for post 2.6.18

James Bottomley
2006-09-24T03:36:28Z

On Sat, 2006-09-23 at 20:30 -0700, Linus Torvalds wrote:
> Ok, we have a networking merge issue:
>
> drivers/scsi/scsi_transport_fc.c: In function 'fc_host_post_event':
> drivers/scsi/scsi_transport_fc.c:483: error: too few arguments to function 'nlmsg_multicast'
> drivers/scsi/scsi_transport_fc.c: In function 'fc_host_post_vendor_event':
> drivers/scsi/scsi_transport_fc.c:557: error: too few arguments to function 'nlmsg_multicast'
> make[2]: *** [drivers/scsi/scsi_transport_fc.o] Error 1
> make[1]: *** [drivers/scsi] Error 2
> make: *** [drivers] Error 2
>
> because there's a new gfp-flag field to nlmsg_multicast().
>
> I suspect this is the proper solution, somebody double-check and test..
>
> Linus
>
> ---
> diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
> index 4ab176e..4401341 100644
> --- a/drivers/scsi/scsi_transport_fc.c
> +++ b/drivers/scsi/scsi_transport_fc.c
> @@ -480,7 +480,7 @@ fc_host_post_event(struct Scsi_Host *sho
> event->event_code = event_code;
> event->event_data = event_data;
>
> - err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS);
> + err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, GFP_KERNEL);
> if (err && (err != -ESRCH)) /* filter no recipient errors */
> /* nlmsg_multicast already kfree_skb'd */
> goto send_fail;
> @@ -554,7 +554,7 @@ fc_host_post_vendor_event(struct Scsi_Ho
> event->event_code = FCH_EVT_VENDOR_UNIQUE;
> memcpy(&event->event_data, data_buf, data_len);
>
> - err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS);
> + err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, GFP_KERNEL);
> if (err && (err != -ESRCH)) /* filter no recipient errors */
> /* nlmsg_multicast already kfree_skb'd */
> goto send_vendor_fail;

Yes, that mirrors the fix I came up with.

James