Module Name: src Committed By: bouyer Date: Sat Apr 20 10:03:05 UTC 2013
Modified Files: src/usr.sbin/dumpfs [netbsd-6]: dumpfs.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.58.4.1 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.58 src/usr.sbin/dumpfs/dumpfs.c:1.58.4.1 --- src/usr.sbin/dumpfs/dumpfs.c:1.58 Tue Aug 30 18:24:17 2011 +++ src/usr.sbin/dumpfs/dumpfs.c Sat Apr 20 10:03:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dumpfs.c,v 1.58 2011/08/30 18:24:17 joerg Exp $ */ +/* $NetBSD: dumpfs.c,v 1.58.4.1 2013/04/20 10:03:04 bouyer 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.58 2011/08/30 18:24:17 joerg Exp $"); +__RCSID("$NetBSD: dumpfs.c,v 1.58.4.1 2013/04/20 10:03:04 bouyer 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);