From owner-svn-src-head@freebsd.org Fri Nov 17 13:12:22 2017 Return-Path: Delivered-To: svn-src-head@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 1AE21DD9F9E; Fri, 17 Nov 2017 13:12:22 +0000 (UTC) (envelope-from scottl@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 DBAC966724; Fri, 17 Nov 2017 13:12:21 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAHDCKl4018780; Fri, 17 Nov 2017 13:12:20 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAHDCK34018777; Fri, 17 Nov 2017 13:12:20 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201711171312.vAHDCK34018777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Fri, 17 Nov 2017 13:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325934 - in head: sbin/fsck_ffs sbin/newfs sys/sys X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head: sbin/fsck_ffs sbin/newfs sys/sys X-SVN-Commit-Revision: 325934 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2017 13:12:22 -0000 Author: scottl Date: Fri Nov 17 13:12:20 2017 New Revision: 325934 URL: https://svnweb.freebsd.org/changeset/base/325934 Log: Rename P_OSREL_CK_CLYGRP to P_OSREL_CK_CYLGRP Modified: head/sbin/fsck_ffs/pass5.c head/sbin/newfs/mkfs.c head/sys/sys/param.h Modified: head/sbin/fsck_ffs/pass5.c ============================================================================== --- head/sbin/fsck_ffs/pass5.c Fri Nov 17 13:01:56 2017 (r325933) +++ head/sbin/fsck_ffs/pass5.c Fri Nov 17 13:12:20 2017 (r325934) @@ -74,7 +74,7 @@ pass5(void) newcg->cg_niblk = fs->fs_ipg; if (preen == 0 && yflag == 0 && fs->fs_magic == FS_UFS2_MAGIC && fswritefd != -1 && (fs->fs_metackhash & CK_CYLGRP) == 0 && - getosreldate() >= P_OSREL_CK_CLYGRP && + getosreldate() >= P_OSREL_CK_CYLGRP && reply("ADD CYLINDER GROUP CHECKSUM PROTECTION") != 0) { fs->fs_metackhash |= CK_CYLGRP; rewritecg = 1; Modified: head/sbin/newfs/mkfs.c ============================================================================== --- head/sbin/newfs/mkfs.c Fri Nov 17 13:01:56 2017 (r325933) +++ head/sbin/newfs/mkfs.c Fri Nov 17 13:12:20 2017 (r325934) @@ -496,7 +496,7 @@ restart: /* * Set flags for metadata that is being check-hashed. */ - if (Oflag > 1 && getosreldate() >= P_OSREL_CK_CLYGRP) + if (Oflag > 1 && getosreldate() >= P_OSREL_CK_CYLGRP) sblock.fs_metackhash = CK_CYLGRP; /* Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Fri Nov 17 13:01:56 2017 (r325933) +++ head/sys/sys/param.h Fri Nov 17 13:12:20 2017 (r325934) @@ -84,7 +84,7 @@ #define P_OSREL_SHUTDOWN_ENOTCONN 1100077 #define P_OSREL_MAP_GUARD 1200035 #define P_OSREL_WRFSBASE 1200041 -#define P_OSREL_CK_CLYGRP 1200046 +#define P_OSREL_CK_CYLGRP 1200046 #define P_OSREL_VMTOTAL64 1200054 #define P_OSREL_MAJOR(x) ((x) / 100000)