CVS commit: src/usr.sbin/dumpfs
Module Name:src
Committed By: mlelstv
Date: Tue Mar 6 07:45:38 UTC 2018
Modified Files:
src/usr.sbin/dumpfs: dumpfs.c
Log Message:
print quota pointers in superblock
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.sbin/dumpfs/dumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dumpfs/dumpfs.c
diff -u src/usr.sbin/dumpfs/dumpfs.c:1.63 src/usr.sbin/dumpfs/dumpfs.c:1.64
--- src/usr.sbin/dumpfs/dumpfs.c:1.63 Tue Sep 3 04:02:13 2013
+++ src/usr.sbin/dumpfs/dumpfs.c Tue Mar 6 07:45:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $ */
+/* $NetBSD: dumpfs.c,v 1.64 2018/03/06 07:45:38 mlelstv Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.64 2018/03/06 07:45:38 mlelstv Exp $");
#endif
#endif /* not lint */
@@ -52,6 +52,7 @@ __RCSID("$NetBSD: dumpfs.c,v 1.63 2013/0
#include
#include
#include
+#include
#include
#include
@@ -405,6 +406,8 @@ print_superblock(struct fs *fs, uint16_t
fs->fs_journallocs[0], fs->fs_journallocs[1]);
printf("\tloc2 %" PRIu64 "\tloc3 %" PRIu64 "\n",
fs->fs_journallocs[2], fs->fs_journallocs[3]);
+ printf("usrquota %" PRIu64 "\tgrpquota %" PRIu64 "\n",
+ fs->fs_quotafile[USRQUOTA], fs->fs_quotafile[GRPQUOTA]);
printf("flags\t");
if (fs->fs_flags == 0)
printf("none");
CVS commit: src/usr.sbin/dumpfs
Module Name:src Committed By: dholland Date: Tue Sep 3 02:25:36 UTC 2013 Modified Files: src/usr.sbin/dumpfs: dumpfs.c Log Message: Teach this to print FS_SUJ (and FS_GJOURNAL, whatever that is, as it was missing for some reason) and cope with FS_INDEXDIRS not currently being defined. Since FS_SUJ actually appears in the wild, it's fairly important to recognize it. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dumpfs/dumpfs.c diff -u src/usr.sbin/dumpfs/dumpfs.c:1.61 src/usr.sbin/dumpfs/dumpfs.c:1.62 --- src/usr.sbin/dumpfs/dumpfs.c:1.61 Sun Jun 23 02:06:05 2013 +++ src/usr.sbin/dumpfs/dumpfs.c Tue Sep 3 02:25:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpfs.c,v 1.61 2013/06/23 02:06:05 dholland Exp $ */ +/* $NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: dumpfs.c,v 1.61 2013/06/23 02:06:05 dholland Exp $); +__RCSID($NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $); #endif #endif /* not lint */ @@ -414,12 +414,14 @@ print_superblock(struct fs *fs, uint16_t printf(soft-updates ); if (fs-fs_flags FS_NEEDSFSCK) printf(needs fsck run ); - if (fs-fs_flags FS_INDEXDIRS) - printf(indexed directories ); + if (fs-fs_flags FS_SUJ) + printf(journaled soft-updates ); if (fs-fs_flags FS_ACLS) printf(acls ); if (fs-fs_flags FS_MULTILABEL) printf(multilabel ); + if (fs-fs_flags FS_GJOURNAL) + printf(gjournal ); if (fs-fs_flags FS_FLAGS_UPDATED) printf(fs_flags expanded ); if (fs-fs_flags FS_DOWAPBL) @@ -427,8 +429,13 @@ print_superblock(struct fs *fs, uint16_t if (fs-fs_flags FS_DOQUOTA2) printf(quotas ); fsflags = fs-fs_flags ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | - FS_INDEXDIRS | FS_ACLS | FS_MULTILABEL | + FS_SUJ | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2); +#ifdef FS_INDEXDIRS + if (fs-fs_flags FS_INDEXDIRS) + printf(indexed directories ); + fsflags = ~FS_INDEXDIRS +#endif if (fsflags != 0) printf(unknown flags (%#x), fsflags); printf(\nfsmnt\t%s\n, fs-fs_fsmnt);
CVS commit: src/usr.sbin/dumpfs
Module Name:src Committed By: dholland Date: Tue Sep 3 04:02:13 UTC 2013 Modified Files: src/usr.sbin/dumpfs: dumpfs.c Log Message: Print FS_TRIM too. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dumpfs/dumpfs.c diff -u src/usr.sbin/dumpfs/dumpfs.c:1.62 src/usr.sbin/dumpfs/dumpfs.c:1.63 --- src/usr.sbin/dumpfs/dumpfs.c:1.62 Tue Sep 3 02:25:36 2013 +++ src/usr.sbin/dumpfs/dumpfs.c Tue Sep 3 04:02:13 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $ */ +/* $NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $); +__RCSID($NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $); #endif #endif /* not lint */ @@ -428,9 +428,11 @@ print_superblock(struct fs *fs, uint16_t printf(wapbl ); if (fs-fs_flags FS_DOQUOTA2) printf(quotas ); + if (fs-fs_flags FS_TRIM) + printf(trim ); fsflags = fs-fs_flags ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_SUJ | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | - FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2); + FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2 | FS_TRIM); #ifdef FS_INDEXDIRS if (fs-fs_flags FS_INDEXDIRS) printf(indexed directories );
CVS commit: src/usr.sbin/dumpfs
Module Name:src Committed By: taca Date: Tue Apr 2 13:31:48 UTC 2013 Modified Files: src/usr.sbin/dumpfs: dumpfs.c Log Message: Show in-filesystem quotas flag instead of unknown flag bit. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dumpfs/dumpfs.c diff -u src/usr.sbin/dumpfs/dumpfs.c:1.59 src/usr.sbin/dumpfs/dumpfs.c:1.60 --- src/usr.sbin/dumpfs/dumpfs.c:1.59 Sat Apr 7 05:07:32 2012 +++ src/usr.sbin/dumpfs/dumpfs.c Tue Apr 2 13:31:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpfs.c,v 1.59 2012/04/07 05:07:32 christos Exp $ */ +/* $NetBSD: dumpfs.c,v 1.60 2013/04/02 13:31:47 taca Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: dumpfs.c,v 1.59 2012/04/07 05:07:32 christos Exp $); +__RCSID($NetBSD: dumpfs.c,v 1.60 2013/04/02 13:31:47 taca Exp $); #endif #endif /* not lint */ @@ -424,9 +424,11 @@ print_superblock(struct fs *fs, uint16_t printf(fs_flags expanded ); if (fs-fs_flags FS_DOWAPBL) printf(wapbl ); + if (fs-fs_flags FS_DOQUOTA2) + printf(quotas ); fsflags = fs-fs_flags ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS | FS_ACLS | FS_MULTILABEL | - FS_FLAGS_UPDATED | FS_DOWAPBL); + FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2); if (fsflags != 0) printf(unknown flags (%#x), fsflags); printf(\nfsmnt\t%s\n, fs-fs_fsmnt);
CVS commit: src/usr.sbin/dumpfs
Module Name:src
Committed By: joerg
Date: Tue Aug 30 18:24:18 UTC 2011
Modified Files:
src/usr.sbin/dumpfs: dumpfs.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/dumpfs/dumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dumpfs/dumpfs.c
diff -u src/usr.sbin/dumpfs/dumpfs.c:1.57 src/usr.sbin/dumpfs/dumpfs.c:1.58
--- src/usr.sbin/dumpfs/dumpfs.c:1.57 Sat Feb 27 12:07:40 2010
+++ src/usr.sbin/dumpfs/dumpfs.c Tue Aug 30 18:24:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpfs.c,v 1.57 2010/02/27 12:07:40 mlelstv Exp $ */
+/* $NetBSD: dumpfs.c,v 1.58 2011/08/30 18:24:17 joerg Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: dumpfs.c,v 1.57 2010/02/27 12:07:40 mlelstv Exp $);
+__RCSID($NetBSD: dumpfs.c,v 1.58 2011/08/30 18:24:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -66,21 +66,21 @@
#include unistd.h
#include util.h
-union fsun {
+static union fsun {
struct fs fs;
char pad[MAXBSIZE];
} fsun;
#define afs fsun.fs
-uint16_t opostblsave[32*8];
+static uint16_t opostblsave[32*8];
-union {
+static union {
struct cg cg;
char pad[MAXBSIZE];
} cgun;
#define acg cgun.cg
-union {
+static union {
struct wapbl_wc_header wh;
struct wapbl_wc_null wn;
char pad[MAXBSIZE];
@@ -101,29 +101,28 @@
opt_cg_summary | opt_superblock | opt_journal )
#define DFLT_OPTS (opt_superblock | opt_cg_summary | opt_cg_info | opt_verbose)
-long dev_bsize = 512;
-int needswap, printold, is_ufs2;
-int Fflag;
-
-uint opt_flags;
-
-int dumpfs(const char *);
-int print_superblock(struct fs *, uint16_t *, const char *, int, off_t);
-int print_cgsum(const char *, int);
-int print_cginfo(const char *, int);
-int print_inodes(const char *, int, int, int);
-int print_alt_super(const char *, int);
-int print_journal(const char *, int);
-void print_journal_header(const char *);
-off_t print_journal_entries(const char *, size_t);
-int dumpcg(const char *, int, int);
-int main(int, char **);
-int openpartition(const char *, int, char *, size_t);
-void pbits(int, void *, int);
-void usage(void);
-void print_ufs1_inode(int, int, void *);
-void print_ufs2_inode(int, int, void *);
-void fix_superblock(struct fs *, uint16_t *);
+static long dev_bsize = 512;
+static int needswap, printold, is_ufs2;
+static int Fflag;
+
+static uint opt_flags;
+
+static int dumpfs(const char *);
+static int print_superblock(struct fs *, uint16_t *, const char *, int, off_t);
+static int print_cgsum(const char *, int);
+static int print_cginfo(const char *, int);
+static int print_inodes(const char *, int, int, int);
+static int print_alt_super(const char *, int);
+static int print_journal(const char *, int);
+static void print_journal_header(const char *);
+static off_t print_journal_entries(const char *, size_t);
+static int dumpcg(const char *, int, int);
+static int openpartition(const char *, int, char *, size_t);
+static void pbits(int, void *, int);
+__dead static void usage(void);
+static void print_ufs1_inode(int, int, void *);
+static void print_ufs2_inode(int, int, void *);
+static void fix_superblock(struct fs *, uint16_t *);
int
main(int argc, char *argv[])
@@ -165,7 +164,7 @@
}
-int
+static int
dumpfs(const char *name)
{
static const off_t sblock_try[] = SBLOCKSEARCH;
@@ -247,7 +246,7 @@
return rval;
}
-void
+static void
fix_superblock(struct fs *fs, uint16_t *opostbl)
{
if (needswap
@@ -286,7 +285,7 @@
fs-fs_old_nrpos = 8;
}
-int
+static int
print_superblock(struct fs *fs, uint16_t *opostbl,
const char *name, int fd, off_t sblock)
{
@@ -465,7 +464,7 @@
return 0;
}
-int
+static int
print_cgsum(const char *name, int fd)
{
struct csum *ccsp;
@@ -507,7 +506,7 @@
return 0;
}
-int
+static int
print_alt_super(const char *name, int fd)
{
union fsun alt;
@@ -534,7 +533,7 @@
return 0;
}
-int
+static int
print_cginfo(const char *name, int fd)
{
int i;
@@ -550,7 +549,7 @@
return 0;
}
-int
+static int
print_inodes(const char *name, int fd, int c, int n)
{
void *ino_buf = malloc(afs.fs_bsize);
@@ -576,7 +575,7 @@
return 0;
}
-int
+static int
dumpcg(const char *name, int fd, int c)
{
off_t cur;
@@ -655,7 +654,7 @@
return (0);
}
-void
+static void
print_ufs1_inode(int inum, int i_off, void *ibuf)
{
struct ufs1_dinode *i = ibuf;
@@ -682,7 +681,7 @@
i-di_gen, i-di_uid, i-di_gid);
}
-void
+static void
print_ufs2_inode(int inum, int i_off, void *ibuf)
{
struct ufs2_dinode *i = ibuf;
@@ -706,7 +705,7 @@
i-di_gen, i-di_uid, i-di_gid);
}
-void
+static void
pbits(int offset, void *vp, int max)
{
int i;
@@ -728,7 +727,7 @@
printf(\n);
}
-int
+static int
print_journal(const char *name, int fd)
{
daddr_t off;
@@ -825,7 +824,7 @@
return
CVS commit: src/usr.sbin/dumpfs
Module Name:src Committed By: lukem Date: Thu May 7 06:40:38 UTC 2009 Modified Files: src/usr.sbin/dumpfs: dumpfs.c Log Message: Display the superblock format as the second line (FFSv1 or FFSv2). No need to display the magic format further down. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dumpfs/dumpfs.c diff -u src/usr.sbin/dumpfs/dumpfs.c:1.52 src/usr.sbin/dumpfs/dumpfs.c:1.53 --- src/usr.sbin/dumpfs/dumpfs.c:1.52 Wed Apr 15 05:43:22 2009 +++ src/usr.sbin/dumpfs/dumpfs.c Thu May 7 06:40:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpfs.c,v 1.52 2009/04/15 05:43:22 lukem Exp $ */ +/* $NetBSD: dumpfs.c,v 1.53 2009/05/07 06:40:38 lukem Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: dumpfs.c,v 1.52 2009/04/15 05:43:22 lukem Exp $); +__RCSID($NetBSD: dumpfs.c,v 1.53 2009/05/07 06:40:38 lukem Exp $); #endif #endif /* not lint */ @@ -275,6 +275,7 @@ time_t t; int32_t fsflags; + printf(format\tFFSv%d\n, is_ufs2+1); #if BYTE_ORDER == LITTLE_ENDIAN if (needswap) #else @@ -287,8 +288,8 @@ if ((sblock != SBLOCK_UFS1) || ISOPT(opt_alt_super)) printf(location %lld\t(-b %lld)\n, (long long)sblock, (long long)(sblock/dev_bsize)); - printf(magic\t%x (UFS%d)\ttime\t%s, - fs-fs_magic, is_ufs2+1, ctime(t)); + printf(magic\t%-8x\ttime\t%s, + fs-fs_magic, ctime(t)); if (is_ufs2) i = 5; @@ -318,7 +319,7 @@ printf(cylgrp\t%s\tinodes\t%s\tsblock\t%s\tfslevel %d\n, i 1 ? static : dynamic, i 2 ? 4.2/4.3BSD : i 5 ? 4.4BSD : FFSv2, - i 4 ? FFSv1 : FFSv2, i); + i 4 ? FFSv1 : FFSv2, i); printf(nbfree\t%lld\tndir\t%lld\tnifree\t%lld\tnffree\t%lld\n, (long long)fs-fs_cstotal.cs_nbfree, (long long)fs-fs_cstotal.cs_ndir,
CVS commit: src/usr.sbin/dumpfs
Module Name:src
Committed By: lukem
Date: Wed Apr 15 05:43:22 UTC 2009
Modified Files:
src/usr.sbin/dumpfs: dumpfs.c
Log Message:
Fix WARNS=4 issues (-Wsign-compare -Wextra)
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/usr.sbin/dumpfs/dumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dumpfs/dumpfs.c
diff -u src/usr.sbin/dumpfs/dumpfs.c:1.51 src/usr.sbin/dumpfs/dumpfs.c:1.52
--- src/usr.sbin/dumpfs/dumpfs.c:1.51 Thu Aug 7 22:26:14 2008
+++ src/usr.sbin/dumpfs/dumpfs.c Wed Apr 15 05:43:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpfs.c,v 1.51 2008/08/07 22:26:14 oster Exp $ */
+/* $NetBSD: dumpfs.c,v 1.52 2009/04/15 05:43:22 lukem Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)dumpfs.c 8.5 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: dumpfs.c,v 1.51 2008/08/07 22:26:14 oster Exp $);
+__RCSID($NetBSD: dumpfs.c,v 1.52 2009/04/15 05:43:22 lukem Exp $);
#endif
#endif /* not lint */
@@ -151,7 +151,7 @@
int
dumpfs(const char *name)
{
- const static off_t sblock_try[] = SBLOCKSEARCH;
+ static const off_t sblock_try[] = SBLOCKSEARCH;
char device[MAXPATHLEN];
int fd, i;
int rval = 1;
@@ -232,7 +232,7 @@
fix_superblock(struct fs *fs, uint16_t *opostbl)
{
if (needswap
- ((bswap32(fs-fs_old_postblformat) == FS_42POSTBLFMT) ||
+ (((int32_t)bswap32(fs-fs_old_postblformat) == FS_42POSTBLFMT) ||
(bswap32(fs-fs_old_postbloff) == offsetof(struct fs, fs_old_postbl_start {
int i;
memcpy(opostbl, fs-fs_old_postbl_start, 512);
