dlm for 3.14
This set includes a single change to speed up recovery times when using SCTP connections. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJS3rFtAAoJEDgbc8f8gGmqLDcP/RHy6yJD25Tqcww8CrE+wZj5 b8sf9zsZR0tbT/L9LiB7F3gwoHoS5BUBs7vq8PUX/qAWLgw5dIL9ZqWBujN0M9pr AOIyAwQtY1U9jINunfYXc4EXfLHYO9pbW7ZJuieg+Tls5meb+werBEbnmNsETht8 NYLcVYQ1VnxR6ohnTzUsheQ5lV8J5AKBYC53ZH32gU1Ua1d6xnxl0Fvq2gwM5uOg Xxo5ugpes5NZLwcUB+Smsf6Fqq3z3oyJkWWh3Vq8BJSduOcNDVd45HXiDM7D/LT9 S6TJAbUH+nTesb4FOP7ew8OewxNJN0TbygJ4CVHvbiM3+7jGJi6esfurNyuATGQ5 VJ18el9T46k5D9s309aa3oNdd1CUbAUJ4eEJU+5/nssuVaAt8H0ETfvme7uIXlCp Pyws08NDT3U91q6Xe1R1FTPFdu0DmqyM9uvMFrtNGMXQxqxXbwco70Y/3HJGhHxb Uk8mOtzjCvVN0gAvB5fB71qNBWBmVsO8M10TsCErbjXb7HJkBKQIq/O5eVRDIVGZ jBenSj6nK3ouQUTNFRas+6pQRR9Pa3m0WH4o9Gj2aCMp48XAc1TKd1ySxRuIplWQ JnJg3BOFpILOqwCNVPXX6TRiWJKdtFrCAm/Q484AChh5GQjhyPWeQg/hiNS8SxG7 UXmHPpAUuoG7LcPfuabr =/Wic -----END PGP SIGNATURE----- Merge tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm Pull dlm update from David Teigland: "A single change to speed up recovery times when using SCTP connections" * tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: set zero linger time on sctp socket
This commit is contained in:
commit
ff0bc6cc7f
|
@ -649,6 +649,7 @@ static void process_sctp_notification(struct connection *con,
|
|||
struct msghdr *msg, char *buf)
|
||||
{
|
||||
union sctp_notification *sn = (union sctp_notification *)buf;
|
||||
struct linger linger;
|
||||
|
||||
switch (sn->sn_header.sn_type) {
|
||||
case SCTP_SEND_FAILED:
|
||||
|
@ -727,6 +728,13 @@ static void process_sctp_notification(struct connection *con,
|
|||
}
|
||||
add_sock(new_con->sock, new_con);
|
||||
|
||||
linger.l_onoff = 1;
|
||||
linger.l_linger = 0;
|
||||
ret = kernel_setsockopt(new_con->sock, SOL_SOCKET, SO_LINGER,
|
||||
(char *)&linger, sizeof(linger));
|
||||
if (ret < 0)
|
||||
log_print("set socket option SO_LINGER failed");
|
||||
|
||||
log_print("connecting to %d sctp association %d",
|
||||
nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
|
||||
|
||||
|
|
Loading…
Reference in a new issue