From owner-svn-src-stable-11@freebsd.org Tue Feb 21 12:51:46 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D80C0CE5A8D; Tue, 21 Feb 2017 12:51:46 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 989B01D3E; Tue, 21 Feb 2017 12:51:46 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1LCpjkH075314; Tue, 21 Feb 2017 12:51:45 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1LCpjfM075312; Tue, 21 Feb 2017 12:51:45 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201702211251.v1LCpjfM075312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 21 Feb 2017 12:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314042 - stable/11/sbin/fsck_ffs X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 12:51:47 -0000 Author: garga (ports committer) Date: Tue Feb 21 12:51:45 2017 New Revision: 314042 URL: https://svnweb.freebsd.org/changeset/base/314042 Log: MFC r313745: * Add missing parameters to usage() * Add missing parameters to manpage synopsis * Add missing description of -d flag * Sort flags descriptions Reviewed by: allanjude, kib Approved by: allanjude MFC after: 1 week Sponsored by: Rubicon Communications (Netgate) Differential Revision: https://reviews.freebsd.org/D9152 Modified: stable/11/sbin/fsck_ffs/fsck_ffs.8 stable/11/sbin/fsck_ffs/main.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/fsck_ffs/fsck_ffs.8 ============================================================================== --- stable/11/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 21 12:45:56 2017 (r314041) +++ stable/11/sbin/fsck_ffs/fsck_ffs.8 Tue Feb 21 12:51:45 2017 (r314042) @@ -29,7 +29,7 @@ .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 .\" $FreeBSD$ .\" -.Dd October 5, 2016 +.Dd February 14, 2017 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BEFfnpRryZ +.Op Fl BCdEFfnpRrSyZ .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -149,45 +149,6 @@ If unexpected errors are found, the file system is marked as needing a foreground check and .Nm exits without attempting any further cleaning. -.It Fl E -Clear unallocated blocks, notifying the underlying device that they -are not used and that their contents may be discarded. -This is useful for filesystems which have been mounted on systems -without TRIM support, or with TRIM support disabled, as well as -filesystems which have been copied from one device to another. -.Pp -See the -.Fl E -and -.Fl t -flags of -.Xr newfs 8 , -and -the -.Fl t -flag of -.Xr tunefs 8 . -.It Fl F -Determine whether the file system needs to be cleaned immediately -in foreground, or if its cleaning can be deferred to background. -To be eligible for background cleaning it must have been running -with soft updates, not have been marked as needing a foreground check, -and be mounted and writable when the background check is to be done. -If these conditions are met, then -.Nm -exits with a zero exit status. -Otherwise it exits with a non-zero exit status. -If the file system is clean, -it will exit with a non-zero exit status so that the clean status -of the file system can be verified and reported during the foreground -checks. -Note that when invoked with the -.Fl F -flag, no cleanups are done. -The only thing that -.Nm -does is to determine whether a foreground or background -check is needed and exit with an appropriate status code. .It Fl b Use the block specified immediately after the flag as the super block for the file system. @@ -243,6 +204,47 @@ first line of output from This option implies the .Fl f flag. +.It Fl d +Enable debugging messages. +.It Fl E +Clear unallocated blocks, notifying the underlying device that they +are not used and that their contents may be discarded. +This is useful for filesystems which have been mounted on systems +without TRIM support, or with TRIM support disabled, as well as +filesystems which have been copied from one device to another. +.Pp +See the +.Fl E +and +.Fl t +flags of +.Xr newfs 8 , +and +the +.Fl t +flag of +.Xr tunefs 8 . +.It Fl F +Determine whether the file system needs to be cleaned immediately +in foreground, or if its cleaning can be deferred to background. +To be eligible for background cleaning it must have been running +with soft updates, not have been marked as needing a foreground check, +and be mounted and writable when the background check is to be done. +If these conditions are met, then +.Nm +exits with a zero exit status. +Otherwise it exits with a non-zero exit status. +If the file system is clean, +it will exit with a non-zero exit status so that the clean status +of the file system can be verified and reported during the foreground +checks. +Note that when invoked with the +.Fl F +flag, no cleanups are done. +The only thing that +.Nm +does is to determine whether a foreground or background +check is needed and exit with an appropriate status code. .It Fl f Force .Nm Modified: stable/11/sbin/fsck_ffs/main.c ============================================================================== --- stable/11/sbin/fsck_ffs/main.c Tue Feb 21 12:45:56 2017 (r314041) +++ stable/11/sbin/fsck_ffs/main.c Tue Feb 21 12:51:45 2017 (r314042) @@ -670,7 +670,7 @@ static void usage(void) { (void) fprintf(stderr, -"usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] filesystem ...\n", +"usage: %s [-BCdEFfnpRrSyZ] [-b block] [-c level] [-m mode] filesystem ...\n", getprogname()); exit(1); }