Tue Sep 3 04:02:13 2013 UTC ()
Print FS_TRIM too.


(dholland)
diff -r1.62 -r1.63 src/usr.sbin/dumpfs/dumpfs.c
cvs diff -r1.62 -r1.63 src/usr.sbin/dumpfs/dumpfs.c (expand / switch to unified diff)

--- src/usr.sbin/dumpfs/dumpfs.c 2013/09/03 02:25:36 1.62
+++ src/usr.sbin/dumpfs/dumpfs.c 2013/09/03 04:02:13 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $ */ 1/* $NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1983, 1992, 1993 4 * Copyright (c) 1983, 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33#ifndef lint 33#ifndef lint
34__COPYRIGHT("@(#) Copyright (c) 1983, 1992, 1993\ 34__COPYRIGHT("@(#) Copyright (c) 1983, 1992, 1993\
35 The Regents of the University of California. All rights reserved."); 35 The Regents of the University of California. All rights reserved.");
36#endif /* not lint */ 36#endif /* not lint */
37 37
38#ifndef lint 38#ifndef lint
39#if 0 39#if 0
40static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; 40static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
41#else 41#else
42__RCSID("$NetBSD: dumpfs.c,v 1.62 2013/09/03 02:25:36 dholland Exp $"); 42__RCSID("$NetBSD: dumpfs.c,v 1.63 2013/09/03 04:02:13 dholland Exp $");
43#endif 43#endif
44#endif /* not lint */ 44#endif /* not lint */
45 45
46#include <sys/param.h> 46#include <sys/param.h>
47#include <sys/time.h> 47#include <sys/time.h>
48 48
49#include <sys/wapbl.h> 49#include <sys/wapbl.h>
50#include <sys/wapbl_replay.h> 50#include <sys/wapbl_replay.h>
51 51
52#include <ufs/ufs/dinode.h> 52#include <ufs/ufs/dinode.h>
53#include <ufs/ufs/ufs_bswap.h> 53#include <ufs/ufs/ufs_bswap.h>
54#include <ufs/ufs/ufs_wapbl.h> 54#include <ufs/ufs/ufs_wapbl.h>
55#include <ufs/ffs/fs.h> 55#include <ufs/ffs/fs.h>
@@ -418,29 +418,31 @@ print_superblock(struct fs *fs, uint16_t @@ -418,29 +418,31 @@ print_superblock(struct fs *fs, uint16_t
418 printf("journaled soft-updates "); 418 printf("journaled soft-updates ");
419 if (fs->fs_flags & FS_ACLS) 419 if (fs->fs_flags & FS_ACLS)
420 printf("acls "); 420 printf("acls ");
421 if (fs->fs_flags & FS_MULTILABEL) 421 if (fs->fs_flags & FS_MULTILABEL)
422 printf("multilabel "); 422 printf("multilabel ");
423 if (fs->fs_flags & FS_GJOURNAL) 423 if (fs->fs_flags & FS_GJOURNAL)
424 printf("gjournal "); 424 printf("gjournal ");
425 if (fs->fs_flags & FS_FLAGS_UPDATED) 425 if (fs->fs_flags & FS_FLAGS_UPDATED)
426 printf("fs_flags expanded "); 426 printf("fs_flags expanded ");
427 if (fs->fs_flags & FS_DOWAPBL) 427 if (fs->fs_flags & FS_DOWAPBL)
428 printf("wapbl "); 428 printf("wapbl ");
429 if (fs->fs_flags & FS_DOQUOTA2) 429 if (fs->fs_flags & FS_DOQUOTA2)
430 printf("quotas "); 430 printf("quotas ");
 431 if (fs->fs_flags & FS_TRIM)
 432 printf("trim ");
431 fsflags = fs->fs_flags & ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | 433 fsflags = fs->fs_flags & ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK |
432 FS_SUJ | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | 434 FS_SUJ | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL |
433 FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2); 435 FS_FLAGS_UPDATED | FS_DOWAPBL | FS_DOQUOTA2 | FS_TRIM);
434#ifdef FS_INDEXDIRS 436#ifdef FS_INDEXDIRS
435 if (fs->fs_flags & FS_INDEXDIRS) 437 if (fs->fs_flags & FS_INDEXDIRS)
436 printf("indexed directories "); 438 printf("indexed directories ");
437 fsflags &= ~FS_INDEXDIRS 439 fsflags &= ~FS_INDEXDIRS
438#endif 440#endif
439 if (fsflags != 0) 441 if (fsflags != 0)
440 printf("unknown flags (%#x)", fsflags); 442 printf("unknown flags (%#x)", fsflags);
441 printf("\nfsmnt\t%s\n", fs->fs_fsmnt); 443 printf("\nfsmnt\t%s\n", fs->fs_fsmnt);
442 if (!printold) 444 if (!printold)
443 printf("volname\t%s\tswuid\t%ju\n", 445 printf("volname\t%s\tswuid\t%ju\n",
444 fs->fs_volname, (uintmax_t)fs->fs_swuid); 446 fs->fs_volname, (uintmax_t)fs->fs_swuid);
445 if (printold) { 447 if (printold) {
446 if (fs->fs_old_cpc != 0) 448 if (fs->fs_old_cpc != 0)