Distributed Replicated Block Device (DRBD) development
 help / color / mirror / Atom feed
From: Michael D Labriola <michael.d.labriola@gmail.com>
To: drbd-dev@lists.linbit.com
Subject: [Drbd-dev] [PATCH 5/8] drbd: use sock_set_keepalive() instead of kernel_setsockopt()
Date: Sun, 13 Dec 2020 00:07:01 -0500	[thread overview]
Message-ID: <20201213050704.997-6-michael.d.labriola@gmail.com> (raw)
In-Reply-To: <20201213050704.997-1-michael.d.labriola@gmail.com>

Looks like the rest of the code has been updated to use 5.8's sock_set_*
and tcp_set_* functions, but we've missed this one case.

Signed-off-by: Michael D Labriola <michael.d.labriola@gmail.com>
---
 drbd/drbd_transport_tcp.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drbd/drbd_transport_tcp.c b/drbd/drbd_transport_tcp.c
index 203dc4e0..3b1d4273 100644
--- a/drbd/drbd_transport_tcp.c
+++ b/drbd/drbd_transport_tcp.c
@@ -883,7 +883,6 @@ static int dtt_connect(struct drbd_transport *transport)
 	struct socket *dsocket, *csocket;
 	struct net_conf *nc;
 	int timeout, err;
-	int one = 1;
 	bool ok;
 
 	dsocket = NULL;
@@ -1065,9 +1064,7 @@ randomize:
 	dsocket->sk->sk_sndtimeo = timeout;
 	csocket->sk->sk_sndtimeo = timeout;
 
-	err = kernel_setsockopt(dsocket, SOL_SOCKET, SO_KEEPALIVE, (char *)&one, sizeof(one));
-	if (err)
-		tr_warn(transport, "Failed to enable SO_KEEPALIVE %d\n", err);
+	sock_set_keepalive(dsocket->sk);
 
 	return 0;
 
-- 
2.17.1


  parent reply	other threads:[~2020-12-13  5:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-13  5:06 [Drbd-dev] Get drbd-9.0 branch building with Linux 5.9 and 5.10 Michael D Labriola
2020-12-13  5:06 ` [Drbd-dev] [PATCH 1/8] compat: fix include for submit_bio test Michael D Labriola
2020-12-13  5:06 ` [Drbd-dev] [PATCH 2/8] compat: fix include for blkdev_get_by_path test Michael D Labriola
2020-12-13  5:06 ` [Drbd-dev] [PATCH 3/8] drbd: don't include vermagic.h Michael D Labriola
2020-12-13  5:07 ` [Drbd-dev] [PATCH 4/8] drbd: fix drbd_submit_bio argument handling Michael D Labriola
2020-12-13  5:07 ` Michael D Labriola [this message]
2020-12-13  5:07 ` [Drbd-dev] [PATCH 6/8] drbd: get rid of set_fs() usage Michael D Labriola
2020-12-13  5:07 ` [Drbd-dev] [PATCH 7/8] drbd: don't use sched_setscheduler() Michael D Labriola
2020-12-13  5:07 ` [Drbd-dev] [PATCH 8/8] compat: remove set_bdi_cap_stable_writes Michael D Labriola
  -- strict thread matches above, loose matches on Subject: below --
2020-12-13  5:58 [Drbd-dev] Get drbd-9.0 branch building with Linux 5.9 and 5.10 Michael D Labriola
2020-12-13  5:58 ` [Drbd-dev] [PATCH 5/8] drbd: use sock_set_keepalive() instead of kernel_setsockopt() Michael D Labriola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201213050704.997-6-michael.d.labriola@gmail.com \
    --to=michael.d.labriola@gmail.com \
    --cc=drbd-dev@lists.linbit.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox