system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 04:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert r326399

Browse source 
Accidentally committed wrong file

Pointy hat to:	asomers
Sponsored by:	Spectra Logic Corp
This commit is contained in:
Alan Somers 2017-11-30 15:34:55 +00:00
parent de65823b48
commit fb20566033
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=326400
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
View file

@ -2398,7 +2398,7 @@ vdev_raidz_io_done(zio_t *zio)
*/
if (parity_errors + parity_untried <
rm->rm_firstdatacol ||
(zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
(zio->io_flags & ZIO_FLAG_RESILVER)) {
n = raidz_parity_verify(zio, rm);
unexpected_errors += n;
ASSERT(parity_errors + n <=
@ -2450,7 +2450,7 @@ vdev_raidz_io_done(zio_t *zio)
* out to failed devices later.
*/
if (parity_errors < rm->rm_firstdatacol - n ||
(zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
(zio->io_flags & ZIO_FLAG_RESILVER)) {
n = raidz_parity_verify(zio, rm);
unexpected_errors += n;
ASSERT(parity_errors + n <=
@ -2552,8 +2552,7 @@ vdev_raidz_io_done(zio_t *zio)
zio_checksum_verified(zio);
if (zio->io_error == 0 && spa_writeable(zio->io_spa) &&
(unexpected_errors ||
(zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB)))) {
(unexpected_errors || (zio->io_flags & ZIO_FLAG_RESILVER))) {
/*
* Use the good data we have in hand to repair damaged children.
*/