Author: mckusick
Date: Mon May 27 22:41:43 2013
New Revision: 251045
URL: http://svnweb.freebsd.org/changeset/base/251045
Log:
MFC of 250708:
Clean up trailing whitespace.
Submitted by: Andy Kosela
MFC of 250710: (delete addition of -k which does not exist in 8-stable)
When running the -m option to generate a newfs(8) command suitable for
recreating the filesystem, check for and output the -i, -k, and -l
options if appropriate.
Note the remaining deficiencies of the -m option in the dumpfs(8)
manual page. Specifically that newfs(8) options -E, -R, -S, and -T
options are not handled and that -p is not useful so is omitted.
Also document that newfs(8) options -n and -r are neither checked
for nor output but should be. The -r flag is needed if the filesystem
uses gjournal(8).
PR: bin/163992
Reported by: Dieter <free...@sopwith.solgatos.com>
Submitted by: Andy Kosela <akos...@andykosela.com>
Modified:
stable/8/sbin/dumpfs/dumpfs.8
stable/8/sbin/dumpfs/dumpfs.c
Directory Properties:
stable/8/sbin/dumpfs/ (props changed)
Modified: stable/8/sbin/dumpfs/dumpfs.8
==============================================================================
--- stable/8/sbin/dumpfs/dumpfs.8 Mon May 27 22:19:01 2013
(r251044)
+++ stable/8/sbin/dumpfs/dumpfs.8 Mon May 27 22:41:43 2013
(r251045)
@@ -28,7 +28,7 @@
.\" @(#)dumpfs.8 8.1 (Berkeley) 6/5/93
.\" $FreeBSD$
.\"
-.Dd Jul 14, 2011
+.Dd May 16, 2013
.Dt DUMPFS 8
.Os
.Sh NAME
@@ -76,6 +76,27 @@ is specified, a
.Xr newfs 8
command is printed that can be used to generate a new file system
with equivalent settings.
+Please note that
+.Xr newfs 8
+options
+.Fl E ,
+.Fl R ,
+.Fl S ,
+and
+.Fl T
+are not handled and
+.Fl p
+is not useful in this case so is omitted.
+.Xr Newfs 8
+options
+.Fl n
+and
+.Fl r
+are neither checked for nor output but should be.
+The
+.Fl r
+flag is needed if the filesystem uses
+.Xr gjournal 8 .
.Sh SEE ALSO
.Xr disktab 5 ,
.Xr fs 5 ,
Modified: stable/8/sbin/dumpfs/dumpfs.c
==============================================================================
--- stable/8/sbin/dumpfs/dumpfs.c Mon May 27 22:19:01 2013
(r251044)
+++ stable/8/sbin/dumpfs/dumpfs.c Mon May 27 22:41:43 2013
(r251045)
@@ -197,15 +197,15 @@ dumpfs(const char *name)
"maxbsize", afs.fs_maxbsize, afs.fs_maxbpg,
afs.fs_maxcontig, afs.fs_contigsumsize);
printf("nbfree\t%jd\tndir\t%jd\tnifree\t%jd\tnffree\t%jd\n",
- (intmax_t)afs.fs_cstotal.cs_nbfree,
+ (intmax_t)afs.fs_cstotal.cs_nbfree,
(intmax_t)afs.fs_cstotal.cs_ndir,
- (intmax_t)afs.fs_cstotal.cs_nifree,
+ (intmax_t)afs.fs_cstotal.cs_nifree,
(intmax_t)afs.fs_cstotal.cs_nffree);
printf("bpg\t%d\tfpg\t%d\tipg\t%d\tunrefs\t%jd\n",
afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg,
(intmax_t)afs.fs_unrefs);
printf("nindir\t%d\tinopb\t%d\tmaxfilesize\t%ju\n",
- afs.fs_nindir, afs.fs_inopb,
+ afs.fs_nindir, afs.fs_inopb,
(uintmax_t)afs.fs_maxfilesize);
printf("sbsize\t%d\tcgsize\t%d\tcsaddr\t%jd\tcssize\t%d\n",
afs.fs_sbsize, afs.fs_cgsize, (intmax_t)afs.fs_csaddr,
@@ -416,8 +416,13 @@ marshal(const char *name)
printf("-f %d ", fs->fs_fsize);
printf("-g %d ", fs->fs_avgfilesize);
printf("-h %d ", fs->fs_avgfpdir);
- /* -i is dumb */
- /* -j..l unimplemented */
+ printf("-i %jd ", fragroundup(fs, lblktosize(fs, fragstoblks(fs,
+ fs->fs_fpg)) / fs->fs_ipg));
+ /* -j..k unimplemented */
+ if (fs->fs_flags & FS_GJOURNAL)
+ printf("-J ");
+ if (fs->fs_flags & FS_MULTILABEL)
+ printf("-l ");
printf("-m %d ", fs->fs_minfree);
/* -n unimplemented */
printf("-o ");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
