Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Dec 2022 05:21:46 GMT
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 896c3e6e8a61 - stable/13 - Fix compilation issue when kernel built without FFS defined.
Message-ID:  <202212040521.2B45LkIk043088@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=896c3e6e8a61606adf4414279c4699918f921510

commit 896c3e6e8a61606adf4414279c4699918f921510
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-12-04 05:20:39 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2022-12-04 05:21:32 +0000

    Fix compilation issue when kernel built without FFS defined.
    
    This is not cherry-picked because it occurs only in 13 and not
    in 14 or later kernels.
    
    Reported by:  Boris Korzun
    Tested by:    Boris Korzun
    PR:           263979
    Sponsored by: The FreeBSD Foundation
---
 sys/ufs/ffs/ffs_subr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 42f1e1a1cad3..d847373a8cde 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -332,9 +332,11 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk,
  */
 static int prtmsg = 1;
 #ifdef _KERNEL
+#ifdef FFS
 SYSCTL_DECL(_vfs_ffs);
 SYSCTL_INT(_vfs_ffs, OID_AUTO, prtsberrmsg, CTLFLAG_RWTUN, &prtmsg, 0,
     "Print error messages when bad superblock values are found");
+#endif /* FFS */
 #endif /* _KERNEL */
 #endif /* STANDALONE_SMALL */
 #undef CHK



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212040521.2B45LkIk043088>