From patchwork Fri Mar 10 16:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp968773wrd; Fri, 10 Mar 2023 08:30:24 -0800 (PST) X-Google-Smtp-Source: AK7set8V5vVOc3aYBTMENz4t+zZpNoO66umokwKIpMtiO5LdTO4YDASN96QW2CoflTZ8dg+ycYTk X-Received: by 2002:a05:6a20:6982:b0:cd:ed5c:513 with SMTP id t2-20020a056a20698200b000cded5c0513mr4022252pzk.31.1678465824221; Fri, 10 Mar 2023 08:30:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678465824; cv=none; d=google.com; s=arc-20160816; b=wzNTZxSV4ohZXr4+g8U1Ldq2SPo58bopuRVhoC8GrInBZkekJDaJgZLVUnSOubnSvy i8uCllRE4w4LaFGhmT4Mm7mHDxC0bqmkLSmeXzN+d6Mp/qk9z6S+de5po3229u0j6RlZ 2SSy6HsaYGO6MXefhMwIQSlpnjGNamj0I4Ik3CVuUoJXBHfoZPP/BSB/CQjc5A08wrt+ VENa2VjibQXtJGpCcIfOJmO8a2Vdf6xST18GltxTn1Yk+PACwWUOKw2Eyhx6q6cO96Qf P81Eza+/DzYDJuqCrd1NywvoEERUYVjpp5hjPhZLtL+FBhuB9Rzh6OgM1sZfYj14p0Jr TjXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=muvL1GJq5JhedIkX9pwejhGqATSkcNKw4maG4yGCMnc=; b=JyXtFYR7GjTJ63FAHjkRv69gF46GwGkv4JkqJ0BxSr9yuldLXCK9AnSUMYpLC4vl2V CIxEX66Cf0AUHwyj7y6BCvlWGy1N284lKED5ANcU8mC5BtmnZh/e9x39CvOjDUlgZr5s lHBiPzhDZf/sSzxbYahEv1uuiZtZiaqf/TunOzFtP7jVRsSKCoK8kbYGJAzDDxBVylNS oMTv1SqPomQ5DPyPMVQl79UevGEWt3nKj1rGB5VqW5KZcfEZD88TegHcVqy7BVql4lJd 6B1gnwKiB9rqhQDa23jPRvACJh/9Iu7ZeVSwHe7WVtBQLE5Y7/eZurP/xl6iQmFlMYcN SPzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XOc0mSNd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q1-20020aa78421000000b005a84b6ca956si29589pfn.315.2023.03.10.08.30.10; Fri, 10 Mar 2023 08:30:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XOc0mSNd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbjCJQOa (ORCPT + 99 others); Fri, 10 Mar 2023 11:14:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbjCJQMe (ORCPT ); Fri, 10 Mar 2023 11:12:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0994111A98B for ; Fri, 10 Mar 2023 08:09:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=muvL1GJq5JhedIkX9pwejhGqATSkcNKw4maG4yGCMnc=; b=XOc0mSNdzPxDUyNWm5cGPWB4ziAtymfox2LdE3+31x4NspyNDNUr658/UDC+WqKg1QFF5/ 3dGj8qDrWT2McpJmUm0HzKLNyneHNV16SE79GM4M20yg4Igdt8ry+aquRKIUF+5EEgBHCP V9adyx9MJuH9CMyucirT/OHTmz5SvtU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-hRpnpB05NIajyxA6Omlh5Q-1; Fri, 10 Mar 2023 11:08:05 -0500 X-MC-Unique: hRpnpB05NIajyxA6Omlh5Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65E091C0758F; Fri, 10 Mar 2023 16:08:04 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69892492B00; Fri, 10 Mar 2023 16:08:02 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 1/5] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c Date: Fri, 10 Mar 2023 17:07:53 +0100 Message-Id: <20230310160757.199253-2-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759998979998626884?= X-GMAIL-MSGID: =?utf-8?q?1759998979998626884?= From: Palmer Dabbelt This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace wouldn't have seen the definition before. Unfortunately this header file became visible to userspace, so the definition has instead been moved to net/atm/svc.c (the only user). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Message-Id: <1447119071-19392-4-git-send-email-palmer@dabbelt.com> Reviewed-by: Arnd Bergmann Reviewed-by: Christoph Hellwig Signed-off-by: Thomas Huth --- include/uapi/linux/atmdev.h | 4 ---- net/atm/svc.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index a5c15cf23bd7..20b0215084fc 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -101,10 +101,6 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) -#endif #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) /* drop party from p2mp call */ diff --git a/net/atm/svc.c b/net/atm/svc.c index 4a02bcaad279..d83556d8beb9 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -28,6 +28,11 @@ #include "signaling.h" #include "addr.h" +#ifdef CONFIG_COMPAT +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL + 4, struct compat_atm_iobuf) +#endif + static int svc_create(struct net *net, struct socket *sock, int protocol, int kern);