From patchwork Fri Feb 17 20:22:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 58767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52983wrn; Fri, 17 Feb 2023 12:27:03 -0800 (PST) X-Google-Smtp-Source: AK7set/ZVgu5hMMFUZSSEGu4a8yfFxbVTv6H1PHT8g8M+wNlxpZIo0ZZiqhZ9wLpG9arEiGZgOh1 X-Received: by 2002:a17:903:1385:b0:19a:ec65:c9cc with SMTP id jx5-20020a170903138500b0019aec65c9ccmr5608218plb.16.1676665623126; Fri, 17 Feb 2023 12:27:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676665623; cv=none; d=google.com; s=arc-20160816; b=oNaHnZ3JUsXh6yR/t8vjYnWfiCsSaXDI4A5Bn3eFYh2WiYvLi3VUY+v078HEDvj9wi yB8ggeNCChU8XAr5qgZf+FosUvs9II7ze0dxsZvTNgyFuwKveGNmxx7WNfqFb8AVQ/qa haxUm5GVOwGzoi4odzhkxIvazzwZKjWXWeASGGbbEZWss4O/nXqUm1Fz13AQgjUlxj2j A8+4Zh+Msxq0QcZ8iyjJs74ludcLLtMG7NtZ9LGMETsiBTJ4T36V0dZ2cwQgm5e3/iru 4urGdAcfRhTfEstgvMMmjdFP4p+dSTjIay/by+a3eNQpkLNn1m7I/MTZYv+bMF71hXHr NLaQ== 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=jNwMQS2nb5Snx2PKXCZ6inX1tp7FOHWAWLevabGCm8U=; b=OwKfGRXY0sNpzkhoWaq2EXj07KnWJcg/fZR0P5+nz/zh4ItXGztz293PYzbN460V1S KOm6ZSSsJvz954prRUXlmd2wH5WTN5veaKOklhZ0tYX3o/fIntkFNpBErC4XZLYROnT4 rEM/0iuCJBhC/uQxsDqxcJdfykXjAsrjNI+oLyE2MkTwp/dtfwuEa1UV5b43sQ9MnNZu k9V14QJRCl//tuepBFzHPnle9ffDIK6X4vDvoZuPLb8xCQp6Xxoevh8ACPlO6Y/0i1Fi u296ISi6fppANhbU+qor2jX4F+plP+Go/dQIrGUgVMRhJsf9aRsiW2GUj6zp3iZgPbTp uWUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Ki3qJE/S"; 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 q4-20020a17090311c400b0019c33978781si472184plh.283.2023.02.17.12.26.50; Fri, 17 Feb 2023 12:27:03 -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="Ki3qJE/S"; 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 S229477AbjBQUYj (ORCPT + 99 others); Fri, 17 Feb 2023 15:24:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbjBQUYe (ORCPT ); Fri, 17 Feb 2023 15:24:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9DE960A5D for ; Fri, 17 Feb 2023 12:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676665406; 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=jNwMQS2nb5Snx2PKXCZ6inX1tp7FOHWAWLevabGCm8U=; b=Ki3qJE/S/vtuF2jzTCXjOeSJTWQqrF9ZSMCCYM+2H8OzlMb92+kVVaYnpHwGMI642JyHos sMLw2UD2n+rMHqMB4Lgv1ZzJRcQ3nfMP0KWcp7ztwRqSNEkj+2KaQInaaUGfWUdn35sDgP ca8EvxuzdwD7HlbRlbqLCEtBgfE610U= 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-136-1e9Ia_q4NjmCzRE9jXbKHA-1; Fri, 17 Feb 2023 15:23:21 -0500 X-MC-Unique: 1e9Ia_q4NjmCzRE9jXbKHA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4F601C05B03; Fri, 17 Feb 2023 20:23:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77C15C15BA0; Fri, 17 Feb 2023 20:23:17 +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, Andrew Waterman , Albert Ou Subject: [PATCH 1/4] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c Date: Fri, 17 Feb 2023 21:22:58 +0100 Message-Id: <20230217202301.436895-2-thuth@redhat.com> In-Reply-To: <20230217202301.436895-1-thuth@redhat.com> References: <20230217202301.436895-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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?1758111332612217956?= X-GMAIL-MSGID: =?utf-8?q?1758111332612217956?= 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 Signed-off-by: Thomas Huth Reviewed-by: Christoph Hellwig --- 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);