d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only try to enable CK_CLYGRP if we're running on kernel newer than

Browse Source 
1200046, the first version that supports this feature. If we set it,
then use an old kernel, we'll break the 'contract' of having
checksummed cylinder groups this flag signifies. To avoid creating
something with an inconsistent state, don't turn the flag on in these
cases. The first full fsck with a new kernel will turn this on.

Spnsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D13114
This commit is contained in:
imp 2017-11-16 21:28:14 +00:00
parent 0708b7cc37
commit b26bd091bd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/fsck_ffs/pass5.c
View File

@ -35,6 +35,7 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/sysctl.h>
@ -73,6 +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 &&
reply("ADD CYLINDER GROUP CHECKSUM PROTECTION") != 0) {
fs->fs_metackhash |= CK_CYLGRP;
rewritecg = 1;

3
sbin/newfs/mkfs.c
View File

@ -44,6 +44,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/file.h>
@ -495,7 +496,7 @@ restart:
/*
* Set flags for metadata that is being check-hashed.
*/
if (Oflag > 1)
if (Oflag > 1 && getosreldate() >= P_OSREL_CK_CLYGRP)
sblock.fs_metackhash = CK_CYLGRP;
/*

4
sbin/newfs/newfs.c
View File

@ -398,10 +398,6 @@ main(int argc, char *argv[])
if (pp != NULL)
pp->p_size *= secperblk;
}
if (getosreldate() < __FreeBSD_version) {
warnx("%s is newer than the running kernel and may not be compatible",
getprogname());
}
mkfs(pp, special);
ufs_disk_close(&disk);
if (!jflag)

1
sys/sys/param.h
View File

@ -84,6 +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_VMTOTAL64 1200054
#define P_OSREL_MAJOR(x) ((x) / 100000)