From nobody Sat May 20 19:22:18 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QNtrn0r7Sz4BRQX for ; Sat, 20 May 2023 19:22:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNtrl6gmbz3wCg; Sat, 20 May 2023 19:22:31 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 34KJMIlv057885 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 20 May 2023 22:22:21 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 34KJMIlv057885 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 34KJMIme057884; Sat, 20 May 2023 22:22:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 20 May 2023 22:22:18 +0300 From: Konstantin Belousov To: Rick Macklem Cc: FreeBSD CURRENT , James Gritton , Mark Johnston Subject: Re: RFC: Dealing with an MFC to stable/13 that breaks the lobprocstat build Message-ID: References: List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Result: default: False [-2.91 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.995]; NEURAL_HAM_SHORT(-0.91)[-0.915]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; TO_DN_ALL(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; R_SPF_SOFTFAIL(0.00)[~all]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_THREE(0.00)[4]; TAGGED_RCPT(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; HAS_XAW(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Queue-Id: 4QNtrl6gmbz3wCg X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N On Sat, May 20, 2023 at 11:38:14AM -0700, Rick Macklem wrote: > Hi, > > So I did an MFC that broke the stable/13 build (it's reverted now). > I didn't realize that changes inside _KERNEL in mount.h would do > this, but now I know. > > Since it is only an issue for stable/13 (and not main), I'd like to do a > minimal fix on the MFC and not mess with adding #includes to libprocstat > sources. > > There are two of them: > 1 - A prototype for a new function called vfs_exjail_delete(), which is in > vfs_export.c and is called in kern_jail.c. > --> For this one, I think the easiest fix is to just move the function > prototype from mount.h to jail.h. > > 2 - Adding a "bool" argument to vfs_export(). > For this one, I think the easiest fix is to re-define the > argument as an "int" > and pass it in as 0/1 instead of false/true. > > Are others agreeable to these changes to the code for the MFS into stable/13? > (Not affecting main.) >From the description, both deviations are fine. It is common practice to do small adjustments when merging to long-lived branch. IMO adding stdbool.h to procstat is easy, but this is your call.