From patchwork Fri Oct 19 15:28:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 10649643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC87B13A4 for ; Fri, 19 Oct 2018 15:29:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBFF627F91 for ; Fri, 19 Oct 2018 15:29:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0D4D27F93; Fri, 19 Oct 2018 15:29:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D3E827F91 for ; Fri, 19 Oct 2018 15:29:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbeJSXfx (ORCPT ); Fri, 19 Oct 2018 19:35:53 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:34558 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726860AbeJSXfx (ORCPT ); Fri, 19 Oct 2018 19:35:53 -0400 Received: by mail-qk1-f194.google.com with SMTP id p6-v6so21260959qkg.1 for ; Fri, 19 Oct 2018 08:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7tGBnP9OD4IAqnLT64l4YNG1h5aS0qzF9cvZEfBXrBM=; b=Am/YRM4hRwlFOEGdAJaYdaJQ5iArh9gsWiPaf47jsYVIb3rI8yxjc7aphk4aW1dr4m uYSvZw1c3FpJ2POiEzz0dEjxo5gpcDfTapaKie8EndYLoL9+noBwTbyt0AtyccOxiNmk bpIcAUH3KdQVz3iaP/kjGbClhcsC0MxEWRnuyiWzSfVNf8RLO/GVaYfzSZXow1iQApDp dFx1n3u4U2waF+CQRMXyN85I7Kbr6BA5op2T1WlZscgll++XAR6C0TL1FqvwJynIW5E9 KGX1mFQc9AeEORJTciaM45p38rzDriXsItr4TTBPMxHYgwfLLoQkiVwSmIaMp7C9UaYZ ySXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7tGBnP9OD4IAqnLT64l4YNG1h5aS0qzF9cvZEfBXrBM=; b=h7GgiPimM/J4dtrxgw1/REtOCkm50E+CCRz14peKlVwO6DNf1Shm8A+3NWo6nHO0JR NCr7po6peGKCuZZYL03rVQGU0vFWVf+T4OkdVWZHk/4S9vyJeZEPak1x+27/Q1gQr9cI ZNLUigFrnAD6jews1oQCAWOq5Mng0IXlaf6Z3PHd/RTez+ql41MZv5k1YvABFkN+d56u RdGVYwrG/j3Ihr5oPoB6H+R/aOS6xkwEaKvVazwwhNxd3Lbk9X/k/9xTU0Q+aB7BoJv8 eKk8lL9SlMIU2/G7DwddN4LfyNBV1lukNNwYATHfFOsUoHDyIE3mbyUCLLBCM9R86oCZ JayQ== X-Gm-Message-State: ABuFfojze2nBFSgViopTZp3EXDUlu6MDbRroLSC1wGzyAYDfgB0s4JRi xk/6V25Y6dj/RjY+6Dt09YbURMWg X-Google-Smtp-Source: ACcGV61t7GYeQvUXG22QMGZTbB6oJslvv/JQNZXNtQ9z1v6xen6tuMBvRh9vUEpBewMpC1nw7CFDYw== X-Received: by 2002:a37:31cf:: with SMTP id x198-v6mr33047296qkx.206.1539962957191; Fri, 19 Oct 2018 08:29:17 -0700 (PDT) Received: from Olgas-MBP-195.attlocal.net (172-10-226-31.lightspeed.livnmi.sbcglobal.net. [172.10.226.31]) by smtp.gmail.com with ESMTPSA id s17-v6sm18126231qtj.31.2018.10.19.08.29.15 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Oct 2018 08:29:16 -0700 (PDT) From: Olga Kornievskaia To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 06/13] NFSD fill-in netloc4 structure Date: Fri, 19 Oct 2018 11:28:58 -0400 Message-Id: <20181019152905.32418-7-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20181019152905.32418-1-olga.kornievskaia@gmail.com> References: <20181019152905.32418-1-olga.kornievskaia@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Olga Kornievskaia nfs.4 defines nfs42_netaddr structure that represents netloc4. Populate needed fields from the sockaddr structure. This will be used by flexfiles and 4.2 inter copy Signed-off-by: Olga Kornievskaia --- fs/nfsd/nfsd.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 0668999..030fccb 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -18,7 +18,7 @@ #include #include #include - +#include #include #include "stats.h" @@ -366,6 +366,35 @@ static inline bool nfsd4_spo_must_allow(struct svc_rqst *rqstp) extern const u32 nfsd_suppattrs[3][3]; +static inline u32 nfsd4_set_netaddr(struct sockaddr *addr, struct nfs42_netaddr *netaddr) +{ + struct sockaddr_in *sin = (struct sockaddr_in *)addr; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr; + unsigned int port; + size_t ret; + + switch (addr->sa_family) { + case AF_INET: + port = ntohs(sin->sin_port); + sprintf(netaddr->netid, "tcp"); + netaddr->netid_len = 3; + break; + case AF_INET6: + port = ntohs(sin6->sin6_port); + sprintf(netaddr->netid, "tcp6"); + netaddr->netid_len = 4; + break; + default: + return nfserrno(-EINVAL); + } + ret = rpc_ntop(addr, netaddr->addr, sizeof(netaddr->addr)); + netaddr->addr_len = ret + snprintf(netaddr->addr + ret, + RPCBIND_MAXUADDRLEN + 1, + ".%u.%u", port >> 8, port & 0xff); + + return 0; +} + static inline bool bmval_is_subset(const u32 *bm1, const u32 *bm2) { return !((bm1[0] & ~bm2[0]) ||