diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2010-04-24 07:05:35 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2010-04-24 07:05:35 +0000 |
| commit | 113db2dddb719510679d71ff41679afe30c8b3d1 (patch) | |
| tree | e551aa2ab43f7f11c3646b241ebf3f582988d375 /sbin/dumpfs | |
| parent | 07b9cc2f468471a723504ac789201a84f6dcd38a (diff) | |
| download | src-113db2dddb719510679d71ff41679afe30c8b3d1.tar.gz src-113db2dddb719510679d71ff41679afe30c8b3d1.zip | |
- Merge soft-updates journaling from projects/suj/head into head. This
brings in support for an optional intent log which eliminates the need
for background fsck on unclean shutdown.
Sponsored by: iXsystems, Yahoo!, and Juniper.
With help from: McKusick and Peter Holm
Notes
Notes:
svn path=/head/; revision=207141
Diffstat (limited to 'sbin/dumpfs')
| -rw-r--r-- | sbin/dumpfs/dumpfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index e4b599504012..38c05f605ad8 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -238,7 +238,7 @@ dumpfs(const char *name) if (fsflags & FS_UNCLEAN) printf("unclean "); if (fsflags & FS_DOSOFTDEP) - printf("soft-updates "); + printf("soft-updates%s ", (fsflags & FS_SUJ) ? "+journal" : ""); if (fsflags & FS_NEEDSFSCK) printf("needs fsck run "); if (fsflags & FS_INDEXDIRS) @@ -255,7 +255,7 @@ dumpfs(const char *name) printf("nfsv4acls "); fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED | - FS_NFS4ACLS); + FS_NFS4ACLS | FS_SUJ); if (fsflags != 0) printf("unknown flags (%#x)", fsflags); putchar('\n'); |