Page MenuHomeFreeBSD

Follow up to roundup addition in r289203
ClosedPublic

Authored by ngie on Oct 21 2015, 8:16 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Oct 16, 1:08 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 10:30 AM
Unknown Object (File)
Wed, Oct 15, 5:33 AM
Subscribers

Details

Summary

Follow up to roundup addition in r289203

  • Rename -r to -R to avoid the clash with makefs -r upstream
  • Document "roundup" under the FFS specific options as it applies just to FFS
  • Rename the roundup variable to "roundup-size" for consistency with other variables"

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 923
Build 923: arc lint + arc unit

Event Timeline

ngie retitled this revision from to Follow up to roundup addition in r289203.
ngie updated this object.
ngie added reviewers: adrian, emaste.
ngie edited edge metadata.

"Should be" should be "should be" :)

ngie edited edge metadata.
adrian edited edge metadata.

Accepted!

This revision is now accepted and ready to land.Oct 21 2015, 6:13 PM
usr.sbin/makefs/makefs.8
285

where is this handled?

usr.sbin/makefs/makefs.8
285

Good catch. It isn't currently (I made some silly assumptions from what I saw in makefs.c:215). I'll fix that and be sure to test it before I submit the next patch.

From usr.sbin/makefs/ffs.c:

185         option_t ffs_options[] = {
186                 { "bsize",      &ffs_opts->bsize,       1,      INT_MAX,
187                                         "block size" },
188                 { "fsize",      &ffs_opts->fsize,       1,      INT_MAX,
189                                         "fragment size" },
190                 { "density",    &ffs_opts->density,     1,      INT_MAX,
191                                         "bytes per inode" },
192                 { "minfree",    &ffs_opts->minfree,     0,      99,
193                                         "minfree" },
194                 { "maxbpg",     &ffs_opts->maxbpg,      1,      INT_MAX,
195                                         "max blocks per file in a cg" },
196                 { "avgfilesize", &ffs_opts->avgfilesize,1,      INT_MAX,
197                                         "expected average file size" },
198                 { "avgfpdir",   &ffs_opts->avgfpdir,    1,      INT_MAX,
199                                         "expected # of files per directory" },
200                 { "extent",     &ffs_opts->maxbsize,    1,      INT_MAX,
201                                         "maximum # extent size" },
202                 { "maxbpcg",    &ffs_opts->maxblkspercg,1,      INT_MAX,
203                                         "max # of blocks per group" },
204                 { "version",    &ffs_opts->version,     1,      2,
205                                         "UFS version" },
206                 { .name = NULL }
207         };
usr.sbin/makefs/makefs.8
199–207

I need to add some more explicit information noting that this only applies to UFS images today, even though the code in makefs.c applies it to everything (or add a note in BUGS).

The reason why is that roundup isn't used outside usr.sbin/makefs/ffs today.

emaste requested changes to this revision.Oct 23 2015, 8:01 PM
emaste edited edge metadata.
This revision now requires changes to proceed.Oct 23 2015, 8:01 PM
ngie edited edge metadata.

Remove note about roundup-size in FFS specific options section

This option will made implemented on all filesystems eventually; for
now it's just only implemented on FFS

ngie edited edge metadata.

Remove unrelated diff that snuck into the last update (sorry >_>)

emaste edited edge metadata.
This revision is now accepted and ready to land.Oct 28 2015, 1:29 AM
This revision was automatically updated to reflect the committed changes.
ngie marked 3 inline comments as done.