Date: Sat, 20 May 2023 22:22:18 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Rick Macklem <rick.macklem@gmail.com> Cc: FreeBSD CURRENT <freebsd-current@freebsd.org>, James Gritton <jamie@freebsd.org>, Mark Johnston <markj@freebsd.org> Subject: Re: RFC: Dealing with an MFC to stable/13 that breaks the lobprocstat build Message-ID: <ZGkd6oNPEga5-fdC@kib.kiev.ua> In-Reply-To: <CAM5tNy5hmgkHj7tK1HaYL-dpgUigkmPqOe0VdZo70tnN=qHk3w@mail.gmail.com> References: <CAM5tNy5hmgkHj7tK1HaYL-dpgUigkmPqOe0VdZo70tnN=qHk3w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZGkd6oNPEga5-fdC>