[src/netbsd-6-0]: src/usr.sbin/dumpfs Pull up following revision(s) (requeste...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44ecd5eda259
branches:  netbsd-6-0
changeset: 774791:44ecd5eda259
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 20 10:03:37 2013 +0000

description:
Pull up following revision(s) (requested by taca in ticket #867):
        usr.sbin/dumpfs/dumpfs.c: revision 1.60
Show in-filesystem quotas flag instead of unknown flag bit.

diffstat:

 usr.sbin/dumpfs/dumpfs.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 437c52329963 -r 44ecd5eda259 usr.sbin/dumpfs/dumpfs.c
--- a/usr.sbin/dumpfs/dumpfs.c  Sat Apr 20 10:00:58 2013 +0000
+++ b/usr.sbin/dumpfs/dumpfs.c  Sat Apr 20 10:03:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumpfs.c,v 1.58 2011/08/30 18:24:17 joerg Exp $        */
+/*     $NetBSD: dumpfs.c,v 1.58.8.1 2013/04/20 10:03:37 bouyer 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.58 2011/08/30 18:24:17 joerg Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.58.8.1 2013/04/20 10:03:37 bouyer Exp $");
 #endif
 #endif /* not lint */
 
@@ -424,9 +424,11 @@
                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);