From nobody Tue May 10 23:06:30 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 380F11AD39D5; Tue, 10 May 2022 23:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyYZH11thz4YkG; Tue, 10 May 2022 23:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652223991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLmI/Noo6SQuf36hSoQPDYzZnTIW89gyoNFntZyo9m8=; b=OtyW8nG1Ozt219NhWZ9zREAPLq9QkWiHM/PaiKoDoljnqKQAcmO7F0ewCAM082mU0jbRwA +hGUsBplqgrQxw0bX+ZSQEkd9yJvlw8Skt9azgZzKQSIFKnKBN1EJHBEwhHXCR9CbylQda zV2im0698huOxB23DUAguc/dROsgER06nAikzvkM3a/AhNAL0T0FJTN8LAuHL13EuD91AJ EIF1JXHXiODILOorb6IwFBLxAnPjoRPSLDl24nyr2S8Tsi7vPh0eIhhHanLAPtFfAO3nB2 +K9ErQtWC3SwlCZKoTQK7/D26Zymi+1cK4iQNywA1VvG9QgmdlAcLgeu0YFlUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECF8D6767; Tue, 10 May 2022 23:06:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24AN6UC4045907; Tue, 10 May 2022 23:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AN6U8t045906; Tue, 10 May 2022 23:06:30 GMT (envelope-from git) Date: Tue, 10 May 2022 23:06:30 GMT Message-Id: <202205102306.24AN6U8t045906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: bf46c0a9ae4e - main - Clean up comments in fsck.h. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf46c0a9ae4e544e07ec460f31962618dffd2b1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652223991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLmI/Noo6SQuf36hSoQPDYzZnTIW89gyoNFntZyo9m8=; b=cdMapekrubg38OIJUnsVWLYDJNTe7ORDHpaznD+Us2RBE3YLU+DNRDyaH942/sQ24j50KC buXTs9Xz56z5zRxfj2A1zDLrGenC1qHde1JJ0dlBB48kcI1euQ2FnPDwHqpkd0Hju4BqpQ 29MRygbS+D9KfkWs5R9cqEPjQmuaD9Vh907edhMgNhkD2WhO4VL8TWhBG2C1mVTTeUvGSN xbaFEArRGaWDQcvuyefW4AlL47uNWhoKVEE7E9a9JDlOrI8Yr7IjT3pxzqnquLxHLosKhf OUmqnoqs66MzM4axnkcmHdBobS80x9BqHTEfPk8bTgYdbD9fHLRFG4WmvRcXTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652223991; a=rsa-sha256; cv=none; b=iQnqotzeRaka4S3DH1OUQeRfLeHtskj0lJolAd6lOajJql0UPqc88KW38XtMrkW5FRqrte 02Wu6g8lr74XIbyrkZZGNpK+x7+v1FdHGFl+sfs/977EVW1b65k5DhsNq37rLesgfonw6V b09NR/BOhP1RMruRCf60pxoOeSc9RtOVncxYIinx4/DSLqGqsnXEMTcc4Rcpg4NkC1h4bz kwUvrJWwoUmZg/624TSjf+RKwElmfxMY7zwp1kz931hL79agrHKLc7yUId4Ddans78Rxo4 q13RQFEh8zh2E6U1oQNZ5t4uiwo2rBuQj3+JTNYEkgqK9h6orJf6/lmRx71yUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bf46c0a9ae4e544e07ec460f31962618dffd2b1e commit bf46c0a9ae4e544e07ec460f31962618dffd2b1e Author: Kirk McKusick AuthorDate: 2022-05-10 23:05:05 +0000 Commit: Kirk McKusick CommitDate: 2022-05-10 23:06:15 +0000 Clean up comments in fsck.h. No functional change. --- sbin/fsck_ffs/fsck.h | 111 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index daa346826eff..1fb0df0c5124 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -226,7 +226,6 @@ extern struct timespec startprog; extern struct bufarea *icachebp; /* inode cache buffer */ extern struct bufarea sblk; /* file system superblock */ extern struct bufarea *pdirbp; /* current directory contents */ -extern int sujrecovery; /* 1 => doing check using the journal */ #define dirty(bp) do { \ if (fswritefd < 0) \ @@ -320,61 +319,61 @@ extern unsigned long numdirs, listmax; extern long countdirs; /* number of directories we actually found */ #define MIBSIZE 3 /* size of fsck sysctl MIBs */ -extern int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */ -extern int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */ -extern int setsize[MIBSIZE]; /* MIB command to set inode size */ -extern int adjndir[MIBSIZE]; /* MIB command to adjust number of directories */ -extern int adjnbfree[MIBSIZE]; /* MIB command to adjust number of free blocks */ -extern int adjnifree[MIBSIZE]; /* MIB command to adjust number of free inodes */ -extern int adjnffree[MIBSIZE]; /* MIB command to adjust number of free frags */ -extern int adjnumclusters[MIBSIZE]; /* MIB command to adjust number of free clusters */ -extern int freefiles[MIBSIZE]; /* MIB command to free a set of files */ -extern int freedirs[MIBSIZE]; /* MIB command to free a set of directories */ -extern int freeblks[MIBSIZE]; /* MIB command to free a set of data blocks */ -extern struct fsck_cmd cmd; /* sysctl file system update commands */ -extern char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ -extern char *cdevname; /* name of device being checked */ -extern long dev_bsize; /* computed value of DEV_BSIZE */ -extern long secsize; /* actual disk sector size */ -extern u_int real_dev_bsize; /* actual disk sector size, not overridden */ -extern char nflag; /* assume a no response */ -extern char yflag; /* assume a yes response */ -extern int bkgrdflag; /* use a snapshot to run on an active system */ -extern off_t bflag; /* location of alternate super block */ -extern int debug; /* output debugging info */ -extern int Eflag; /* delete empty data blocks */ -extern int Zflag; /* zero empty data blocks */ -extern int zflag; /* zero unused directory space */ -extern int inoopt; /* trim out unused inodes */ -extern char ckclean; /* only do work if not cleanly unmounted */ -extern int cvtlevel; /* convert to newer file system format */ -extern int ckhashadd; /* check hashes to be added */ -extern int bkgrdcheck; /* determine if background check is possible */ -extern int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ -extern char usedsoftdep; /* just fix soft dependency inconsistencies */ -extern char preen; /* just fix normal inconsistencies */ -extern char rerun; /* rerun fsck. Only used in non-preen mode */ -extern int returntosingle; /* 1 => return to single user mode on exit */ -extern char resolved; /* cleared if unresolved changes => not clean */ -extern int sbhashfailed; /* when reading superblock check hash failed */ -extern char havesb; /* superblock has been read */ -extern char skipclean; /* skip clean file systems if preening */ -extern int fsmodified; /* 1 => write done to file system */ -extern int fsreadfd; /* file descriptor for reading file system */ -extern int fswritefd; /* file descriptor for writing file system */ -extern int surrender; /* Give up if reads fail */ -extern int wantrestart; /* Restart fsck on early termination */ - -extern ufs2_daddr_t maxfsblock; /* number of blocks in the file system */ -extern char *blockmap; /* ptr to primary blk allocation map */ -extern ino_t maxino; /* number of inodes in file system */ - -extern ino_t lfdir; /* lost & found directory inode number */ -extern const char *lfname; /* lost & found directory name */ -extern int lfmode; /* lost & found directory creation mode */ - -extern ufs2_daddr_t n_blks; /* number of blocks in use */ -extern ino_t n_files; /* number of files in use */ +extern int adjblkcnt[MIBSIZE]; /* MIB cmd to adjust inode block count */ +extern int adjrefcnt[MIBSIZE]; /* MIB cmd to adjust inode reference count */ +extern int adjndir[MIBSIZE]; /* MIB cmd to adjust number of directories */ +extern int adjnbfree[MIBSIZE]; /* MIB cmd to adjust number of free blocks */ +extern int adjnifree[MIBSIZE]; /* MIB cmd to adjust number of free inodes */ +extern int adjnffree[MIBSIZE]; /* MIB cmd to adjust number of free frags */ +extern int adjnumclusters[MIBSIZE]; /* MIB cmd adjust number of free clusters */ +extern int freefiles[MIBSIZE]; /* MIB cmd to free a set of files */ +extern int freedirs[MIBSIZE]; /* MIB cmd to free a set of directories */ +extern int freeblks[MIBSIZE]; /* MIB cmd to free a set of data blocks */ +extern int setsize[MIBSIZE]; /* MIB cmd to set inode size */ +extern struct fsck_cmd cmd; /* sysctl file system update commands */ + +extern int bkgrdcheck; /* determine if background check is possible */ +extern int bkgrdsumadj; /* whether the kernel has the ability to adjust + the superblock summary fields */ +extern off_t bflag; /* location of alternate super block */ +extern int bkgrdflag; /* use a snapshot to run on an active system */ +extern char *blockmap; /* ptr to primary blk allocation map */ +extern char *cdevname; /* name of device being checked */ +extern char ckclean; /* only do work if not cleanly unmounted */ +extern int ckhashadd; /* check hashes to be added */ +extern int cvtlevel; /* convert to newer file system format */ +extern long dev_bsize; /* computed value of DEV_BSIZE */ +extern u_int real_dev_bsize; /* actual disk sector size, not overridden */ +extern int debug; /* output debugging info */ +extern int Eflag; /* delete empty data blocks */ +extern int fsmodified; /* 1 => write done to file system */ +extern int fsreadfd; /* file descriptor for reading file system */ +extern int fswritefd; /* file descriptor for writing file system */ +extern char havesb; /* superblock has been read */ +extern int inoopt; /* trim out unused inodes */ +extern ino_t lfdir; /* lost & found directory inode number */ +extern int lfmode; /* lost & found directory creation mode */ +extern const char *lfname; /* lost & found directory name */ +extern ufs2_daddr_t maxfsblock; /* number of blocks in the file system */ +extern ino_t maxino; /* number of inodes in file system */ +extern ufs2_daddr_t n_blks; /* number of blocks in use */ +extern ino_t n_files; /* number of files in use */ +extern char nflag; /* assume a no response */ +extern char preen; /* just fix normal inconsistencies */ +extern char rerun; /* rerun fsck. Only used in non-preen mode */ +extern char resolved; /* cleared if unresolved changes => not clean */ +extern int returntosingle; /* 1 => return to single user mode on exit */ +extern int sbhashfailed; /* when reading superblock check hash failed */ +extern long secsize; /* actual disk sector size */ +extern char skipclean; /* skip clean file systems if preening */ +extern char snapname[BUFSIZ]; /* when doing snapshots, the name of the file */ +extern int sujrecovery; /* 1 => doing check using the journal */ +extern int surrender; /* Give up if reads fail */ +extern char usedsoftdep; /* just fix soft dependency inconsistencies */ +extern int wantrestart; /* Restart fsck on early termination */ +extern char yflag; /* assume a yes response */ +extern int zflag; /* zero unused directory space */ +extern int Zflag; /* zero empty data blocks */ extern volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ extern volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */