diff options
| -rw-r--r-- | usr/src/tools/env/illumos.sh | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev_disk.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zil.c | 13 |
3 files changed, 17 insertions, 8 deletions
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh index 56137d4beb..51c2a458c1 100644 --- a/usr/src/tools/env/illumos.sh +++ b/usr/src/tools/env/illumos.sh @@ -35,7 +35,6 @@ # do not bringover from the parent (-n) # runs 'make check' (-C) # checks for new interfaces in libraries (-A) -# runs lint in usr/src (-l plus the LINTDIRS variable) # sends mail on completion (-m and the MAILTO variable) # creates packages for PIT/RE (-p) # checks for changes in ELF runpaths (-r) @@ -46,7 +45,7 @@ # - This script is only interpreted by ksh93 and explicitly allows the # use of ksh93 language extensions. # -export NIGHTLY_OPTIONS='-FnCDAlmprt' +export NIGHTLY_OPTIONS='-FnCDAmprt' # CODEMGR_WS - where is your workspace at #export CODEMGR_WS="$HOME/ws/illumos-gate" @@ -224,6 +223,8 @@ export SPRO_VROOT="$SPRO_ROOT" # # To disable shadow compilation, unset SHADOW_* or set them to the empty string. # +export SHADOW_CCS=gcc7,/usr/gcc/7/bin/gcc,gnu +export SHADOW_CCCS=gcc7,/usr/gcc/7/bin/g++,gnu # This goes along with lint - it is a series of the form "A [y|n]" which # means "go to directory A and run 'make lint'" Then mail me (y) the diff --git a/usr/src/uts/common/fs/zfs/vdev_disk.c b/usr/src/uts/common/fs/zfs/vdev_disk.c index e4b86b419b..bfae9dbe85 100644 --- a/usr/src/uts/common/fs/zfs/vdev_disk.c +++ b/usr/src/uts/common/fs/zfs/vdev_disk.c @@ -39,6 +39,13 @@ #include <sys/fm/fs/zfs.h> /* + * Tunable parameter for debugging or performance analysis. Setting this + * will cause pool corruption on power loss if a volatile out-of-order + * write cache is enabled. + */ +boolean_t zfs_nocacheflush = B_FALSE; + +/* * Virtual device vector for disks. */ diff --git a/usr/src/uts/common/fs/zfs/zil.c b/usr/src/uts/common/fs/zfs/zil.c index 66dbf3c386..07d67a0816 100644 --- a/usr/src/uts/common/fs/zfs/zil.c +++ b/usr/src/uts/common/fs/zfs/zil.c @@ -96,11 +96,12 @@ int zfs_commit_timeout_pct = 5; int zil_replay_disable = 0; /* - * Tunable parameter for debugging or performance analysis. Setting - * zfs_nocacheflush will cause corruption on power loss if a volatile - * out-of-order write cache is enabled. + * Disable the DKIOCFLUSHWRITECACHE commands that are normally sent to + * the disk(s) by the ZIL after an LWB write has completed. Setting this + * will cause ZIL corruption on power loss if a volatile out-of-order + * write cache is enabled. */ -boolean_t zfs_nocacheflush = B_FALSE; +boolean_t zil_nocacheflush = B_FALSE; /* * Limit SLOG write size per commit executed with synchronous priority. @@ -992,7 +993,7 @@ zil_lwb_add_block(lwb_t *lwb, const blkptr_t *bp) int ndvas = BP_GET_NDVAS(bp); int i; - if (zfs_nocacheflush) + if (zil_nocacheflush) return; mutex_enter(&lwb->lwb_vdev_lock); @@ -1016,7 +1017,7 @@ zil_lwb_add_txg(lwb_t *lwb, uint64_t txg) /* * This function is a called after all VDEVs associated with a given lwb * write have completed their DKIOCFLUSHWRITECACHE command; or as soon - * as the lwb write completes, if "zfs_nocacheflush" is set. + * as the lwb write completes, if "zil_nocacheflush" is set. * * The intention is for this function to be called as soon as the * contents of an lwb are considered "stable" on disk, and will survive |