From patchwork Fri Nov 8 21:32:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 178990 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3312424ilf; Fri, 8 Nov 2019 13:35:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzW6MyzlVQ5ccn3QFUaGnxew6pGXmRHonNKvFT60cHiGtjyAyhUvplmDhOuHFWWjf+axduK X-Received: by 2002:a50:ab10:: with SMTP id s16mr12732569edc.118.1573248904171; Fri, 08 Nov 2019 13:35:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573248904; cv=none; d=google.com; s=arc-20160816; b=P42NigbqSGMhP7IzteCReKenn69WR3p+6A8Y+vAMYRKHZVQB60GC4ScHD8DpC2TXFG kZDTAqvIDFoHlq8AW9+m3ZsUCkJ6qAVrhFZSXAn0oa4y2iFBV22YOP6kVQC/sheTdZk+ 6ejlOJfXTqn6/PlX6GEAsyAzfx6rSbtRA25++d1WYZAp6mM/BInoZV3kWkPAvV3dO+94 5PgwRWc/CaqFmjm3piQ/lcG3pkA5ir03OcRiQlVbpx9Yxz3n/lX2m1rJPnagyCFD3Bh7 vDaKtlXrbxiH37AHcVa2ZdVkmTc7iIupzdNZ5FECRvnlF7Vcy0aM0a8YNlUBozxHvwpt yBwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qXBIDlU0xwzoDWO8fC2ZZrOf/pRpzIi4/cuPh0t/phk=; b=PzxpauPaYOjV7PTudfvueIz0+vcx1FViQZdT5zZ+/T7R2nuSUuBkoWaXQ9XqRHnn+K BQu+xCSqrClpinY9SaXR0kkg2GxKBvetRDDK2Hgdiir38Idv6Q2ykmNx70pbpbOBEMDz 92jlBSLJgEFfKbJcV+1JfUDh5/PWqFMR9bX5qIuV52KIAw6WdL/9aZPc7piY5h7TkAwV +5uSoGTM8ujpYXAJBygoCeTCZETTnRv/qz/bjg0Kodu+iWTaZxbhpqFUE/fQIVRmjh8k SrjXkWIAq5aXEH8QQUJxK7Kc8/rw7eFzo+bMXyRDL2csucfB8OG8ky3JSv2oQhtJdrC+ jDug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6si5513010edl.108.2019.11.08.13.35.03; Fri, 08 Nov 2019 13:35:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733166AbfKHVfB (ORCPT + 26 others); Fri, 8 Nov 2019 16:35:01 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:59311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733060AbfKHVez (ORCPT ); Fri, 8 Nov 2019 16:34:55 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MLzSD-1iBFNN1WBV-00Hvwr; Fri, 08 Nov 2019 22:34:36 +0100 From: Arnd Bergmann To: y2038@lists.linaro.org, Christine Caulfield , David Teigland Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Deepa Dinamani , Richard Fontana , Alexios Zavras , Willem de Bruijn , Greg Kroah-Hartman , Thomas Gleixner , David Windsor , cluster-devel@redhat.com Subject: [PATCH 04/16] dlm: use SO_SNDTIMEO_NEW instead of SO_SNDTIMEO_OLD Date: Fri, 8 Nov 2019 22:32:42 +0100 Message-Id: <20191108213257.3097633-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191108213257.3097633-1-arnd@arndb.de> References: <20191108213257.3097633-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:uHa/QjAGTByeAkpaDyB/vmnZ68MBZaHn8BbKmiyg4MIyd5kOgr/ oPvkjfCzukaGEqPfPs46BihWpfl4F/gQJ3kQGEB+v25O7LUWaxKwPkPAcNHU8h+MQbnVZAN hd62BomG6NZ5ED6zjrQMrcCfz99gcXhaVP2VS/iuTaIzr8doR+4KM9eIgD8Ug2xmWNmrivZ JpWyIOQrq1vNgXmSWjp0A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Qd/hYklCPQw=:UXlIHNa+YNOfgmM92uODnY g60pWnm0PQin6NlohRtJRMf0RxVHPW8A/DGP+UHxznP/Ger+UlSBqc2mbMr0hiW0ds3eyJVPh OhSJFdBuRA22S+jqbdejdgkWLcJ/202e43Vy6IjyKOyOrRMy6FDKP+bM/frQA6NFGduzOfvFy 4lQxVB6UfEWFmsIV7Y4srgYNNUlK4Qp1BuOFcA206mOMH2dKzCOfEQCtRnz7XZqSvmuBUyRxm 72YtEOhqf+OV5PWrRo0MBLhSWamU8PWM4ZZK85PKCx8AG4RelG3GAFLXH23v/AG3gFDspXUBJ 8WQnlWqDch6EfdHCBcykfnayrAsX0d5zpRL3hrDAIQP2WRb6g+p2wV9Ktu2yW+6RsYM1YcJiR eAIVUFE4MuzRm3uvYjcGnJ3/UEjBiPrQOqkbgoN8mKPbNmFddlukm3WSrUza/gUpQR7i/7dw9 1d9x706JHtWe4fwEM8IzLGSYbkjiWuBJnxGLavzbPfXwvMYzV4x52IJxGbWVdu6DqNNNENbWw SUsk2UlFELckfxqSsK6Agai0whttWZ7nw60jpxXzeqJ3OiwHy+o/f3o/X5etTlxaHcnaD/1KW ztWcZ2okEcUFPNbVrOjKvg85SIqZq3ns/6iamtrEjhHPpCRqk2qGgsw71obLWVv2nssAtg17m vixTARz6rY5KMGRim7d+ffqBUmtFXeeTuNlOlLwPymIjHmeTALMTBHUMJUn9cVBNtBsziCiR9 MPzcK0XbjKvQoazaLhrBabqX5LKRsUQs+NTs7t6b/MHfgx6NC9wMcWiPdQBPuDmKuO55EddN0 zFxE3gb5DxTIPtjdhxPCslQ8VcNyjsEwsGIOsr/uxsNKCRaDgfWpC9xqsqg7kTWMzyADnSB0s UmKbhjv3Lbk+snafAvhA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Eliminate one more use of 'struct timeval' from the kernel so we can eventually remove the definition as well. The kernel supports the new format with a 64-bit time_t version of timeval here, so use that instead of the old timeval. Signed-off-by: Arnd Bergmann --- fs/dlm/lowcomms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.0 Acked-by: Deepa Dinamani diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 3951d39b9b75..cdfaf4f0e11a 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1035,7 +1035,7 @@ static void sctp_connect_to_sock(struct connection *con) int result; int addr_len; struct socket *sock; - struct timeval tv = { .tv_sec = 5, .tv_usec = 0 }; + struct __kernel_sock_timeval tv = { .tv_sec = 5, .tv_usec = 0 }; if (con->nodeid == 0) { log_print("attempt to connect sock 0 foiled"); @@ -1087,12 +1087,12 @@ static void sctp_connect_to_sock(struct connection *con) * since O_NONBLOCK argument in connect() function does not work here, * then, we should restore the default value of this attribute. */ - kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv, + kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_NEW, (char *)&tv, sizeof(tv)); result = sock->ops->connect(sock, (struct sockaddr *)&daddr, addr_len, 0); memset(&tv, 0, sizeof(tv)); - kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_OLD, (char *)&tv, + kernel_setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO_NEW, (char *)&tv, sizeof(tv)); if (result == -EINPROGRESS)