Is there a good reason to continue to include wapbl.h in the lfs source files? As far as I can see, nothing in lfs uses any of the macros or structs that are defined in wapbl.h; other than the #include lines, the only references to either wapbl or WAPBL in the lfs sources is in some error-exit labels:
# grep -e wapbl -i sys/ufs/lfs/* sys/ufs/lfs/ulfs_inode.c:#include "opt_wapbl.h" sys/ufs/lfs/ulfs_inode.c:#include <sys/wapbl.h> sys/ufs/lfs/ulfs_inode.c: /* note: originally the first was inside a wapbl txn */ sys/ufs/lfs/ulfs_lookup.c:#include <sys/wapbl.h> sys/ufs/lfs/ulfs_quota2.c:#include <sys/wapbl.h> sys/ufs/lfs/ulfs_quota2.c: goto out_wapbl; sys/ufs/lfs/ulfs_quota2.c: goto out_wapbl; sys/ufs/lfs/ulfs_quota2.c: goto out_wapbl; sys/ufs/lfs/ulfs_quota2.c:out_wapbl: sys/ufs/lfs/ulfs_quota2.c: goto out_wapbl; sys/ufs/lfs/ulfs_quota2.c: goto out_wapbl; sys/ufs/lfs/ulfs_quota2.c:out_wapbl: sys/ufs/lfs/ulfs_snapshot.c:#include <sys/wapbl.h> sys/ufs/lfs/ulfs_vnops.c:#include <sys/wapbl.h> # +------------------+--------------------------+-------------------------+ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired) | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org | +------------------+--------------------------+-------------------------+