svn commit: r328829 - in head/sys: conf geom/label

[Xin LI]

Author: delphij
Date: Sat Feb  3 09:15:13 2018
New Revision: 328829
URL: https://svnweb.freebsd.org/changeset/base/328829

Log:
  After r328426, g_label depends on UFS (option FFS) code to read UFS
  superblock, and the kernel will fail to link when UFS is not built
  in.  This commit makes it depend on a small portion of FFS bits and
  thereby fixes build for this situation.
  
  This is intended as an interim bandaid, and the actual superblock
  reading code should probably be made independent of UFS, so we do
  not need to depend on it (see kib@'s comment in the review for
  details), and we will revisit this once the superblock check hashes
  are all in place.
  
  Differential Revision:	https://reviews.freebsd.org/D14092

Modified:
  head/sys/conf/files
  head/sys/geom/label/g_label_ufs.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sat Feb  3 02:17:25 2018	(r328828)
+++ head/sys/conf/files	Sat Feb  3 09:15:13 2018	(r328829)
@@ -4814,8 +4814,8 @@ ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs
 ufs/ffs/ffs_snapshot.c		optional ffs
 ufs/ffs/ffs_softdep.c		optional ffs
-ufs/ffs/ffs_subr.c		optional ffs
-ufs/ffs/ffs_tables.c		optional ffs
+ufs/ffs/ffs_subr.c		optional ffs | geom_label
+ufs/ffs/ffs_tables.c		optional ffs | geom_label
 ufs/ffs/ffs_vfsops.c		optional ffs
 ufs/ffs/ffs_vnops.c		optional ffs
 ufs/ffs/ffs_rawread.c		optional ffs directio

Modified: head/sys/geom/label/g_label_ufs.c
==============================================================================
--- head/sys/geom/label/g_label_ufs.c	Sat Feb  3 02:17:25 2018	(r328828)
+++ head/sys/geom/label/g_label_ufs.c	Sat Feb  3 09:15:13 2018	(r328829)
@@ -146,3 +146,5 @@ struct g_label_desc g_label_ufs_id = {
 
 G_LABEL_INIT(ufsid, g_label_ufs_id, "Create device nodes for UFS file system IDs");
 G_LABEL_INIT(ufs, g_label_ufs_volume, "Create device nodes for UFS volume names");
+
+MODULE_DEPEND(g_label, ufs, 1, 1, 1);