msdosfs: Add _WANT_MSDOSFS_INTERNALS to replace MAKEFS in headers
ClosedPublic
Actions

Authored by jrtc27 on Fri, Jun 6, 2:14 PM.

Details

Reviewers

imp
markj

Commits

rGb61239ef83d6: msdosfs: Add _WANT_MSDOSFS_INTERNALS to replace MAKEFS in headers

Summary

This lets other bits of userspace expose these various definitions too.
The function prototypes surely won't be useful in other contexts, but
the various types are, and it's not worth hiding the prototypes unless
they end up causing issues, but so long as they aren't called they
shouldn't be a problem.

Note the MAKEFS define continues to exist, but only for use in
newfs_msdos, as those sources are reused by makefs with some changed
behaviour.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 64918
Build 61801: arc lint + arc unit

Event Timeline

jrtc27 created this revision.Fri, Jun 6, 2:14 PM

Herald added a subscriber: imp. · View Herald TranscriptFri, Jun 6, 2:14 PM

jrtc27 requested review of this revision.Fri, Jun 6, 2:14 PM

Harbormaster completed remote builds in B64675: Diff 156635.Fri, Jun 6, 2:14 PM

jrtc27 added a child revision: D50719: libprocstat: Drop all _KERNEL defines outside of zfs_defs.c.Fri, Jun 6, 2:16 PM

imp accepted this revision.Fri, Jun 6, 2:48 PM

This revision is now accepted and ready to land.Fri, Jun 6, 2:48 PM

markj accepted this revision.Fri, Jun 6, 4:26 PM

markj added a subscriber: markj.

markj added inline comments.

sys/fs/msdosfs/msdosfsmount.h
119–120	Or just include _lockmgr.h and _lock.h like you did in D50716? I'm not a big fan of conditionally compiled struct members.

jrtc27 added inline comments.Fri, Jun 6, 5:08 PM

sys/fs/msdosfs/msdosfsmount.h
119–120	Perhaps this one really should be `#ifndef MAKEFS`... in the libkvm-related cases you probably do want the actual kernel layout, but for makefs it isn't using these. I guess you could still define them for makefs, but it could get confusing to have locks that are documented as being for something yet not used for that in makefs. Not sure what's best really.

markj added inline comments.Sat, Jun 7, 1:06 PM

sys/fs/msdosfs/msdosfsmount.h
119–120	IMO it's not that great a sin to leave unused lock fields in the structure even though they're unused by makefs. There are other fields here which are certainly not used by makefs, e.g., `pm_mountp`, `pm_cp`, `pm_bo`, and the pervasive use of kernel structures and code in makefs already makes things confusing in my experience. I'd probably just get rid of the ifdef and make the header self-contained, but it's up to you.