Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jan 2023 18:29:57 +0100
From:      Mateusz Guzik <mjguzik@gmail.com>
To:        Konstantin Belousov <kib@freebsd.org>
Cc:        src-committers@freebsd.org, dev-commits-src-all@freebsd.org,  dev-commits-src-main@freebsd.org
Subject:   Re: git: 68912701700c - main - ffs_suspend.c: clean up includes
Message-ID:  <CAGudoHEqJVvxp8-PbbrHM9=Qz=jSV8PQR8q848HJOmULiVSZzg@mail.gmail.com>
In-Reply-To: <202212292056.2BTKuOIu047460@gitrepo.freebsd.org>
References:  <202212292056.2BTKuOIu047460@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 12/29/22, Konstantin Belousov <kib@freebsd.org> wrote:
> The branch main has been updated by kib:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=68912701700ca3230f3e2d4b7858a038f884a327
>
> commit 68912701700ca3230f3e2d4b7858a038f884a327
> Author:     Konstantin Belousov <kib@FreeBSD.org>
> AuthorDate: 2022-12-28 18:17:53 +0000
> Commit:     Konstantin Belousov <kib@FreeBSD.org>
> CommitDate: 2022-12-29 20:55:39 +0000
>
>     ffs_suspend.c: clean up includes
>
>     Order includes alphabetically.
>     Remove unneeded sys/param.h, it is already included by sys/systm.h.
>
>     Reviewed by:    mckusick
>     Sponsored by:   The FreeBSD Foundation
>     MFC after:      1 week
>     Differential revision:  https://reviews.freebsd.org/D37896
> ---
>  sys/ufs/ffs/ffs_suspend.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c
> index d13097109758..e7c976b6e921 100644
> --- a/sys/ufs/ffs/ffs_suspend.c
> +++ b/sys/ufs/ffs/ffs_suspend.c
> @@ -33,15 +33,14 @@
>  #include <sys/cdefs.h>
>  __FBSDID("$FreeBSD$");
>
> -#include <sys/param.h>
>  #include <sys/systm.h>
>  #include <sys/buf.h>
> -#include <sys/ioccom.h>
> -#include <sys/mount.h>
> -#include <sys/vnode.h>
>  #include <sys/conf.h>
> +#include <sys/ioccom.h>
>  #include <sys/jail.h>
> +#include <sys/mount.h>
>  #include <sys/sx.h>
> +#include <sys/vnode.h>
>
>  #include <security/mac/mac_framework.h>
>
>

tinderbox fails the KCSAN et al kernels:

In file included from /usr/src/sys/ufs/ffs/ffs_suspend.c:36:
In file included from /usr/src/sys/sys/systm.h:44:
In file included from ./machine/atomic.h:73:
/usr/src/sys/sys/atomic_san.h:117:24: error: unknown type name 'uint8_t'
ATOMIC_SAN_FUNCS(char, uint8_t);
                       ^
it bisects to this commit

-- 
Mateusz Guzik <mjguzik gmail.com>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHEqJVvxp8-PbbrHM9=Qz=jSV8PQR8q848HJOmULiVSZzg>