diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-09-15 15:30:07 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-09-15 15:30:53 +0000 |
| commit | 53b70c86d93c1e4d3c76f1282e94154e88780d7e (patch) | |
| tree | 7de40c23766ddb80ad4b37a1140b302dbe96a92f /sys/contrib/openzfs/module/zfs/abd.c | |
| parent | 6e8272f317b899438165108a72fa04a4995611bd (diff) | |
| parent | 4a1195ca5041cbff2a6b025a31937fef84876c52 (diff) | |
| download | src-53b70c86d93c1e4d3c76f1282e94154e88780d7e.tar.gz src-53b70c86d93c1e4d3c76f1282e94154e88780d7e.zip | |
zfs: merge openzfs/zfs@4a1195ca5 (master) into main
Notable upstream pull request merges:
#11312 Temporarily use root credentials to mount snapshots in .zfs
#12246 arc: Drop an incorrect assert
#12443 Fixed data integrity issue when underlying disk returns error
to zfs
#12522 Compressed receive with different ashift can result in incorrect
PSIZE on disk
#12535 Verify embedded blkptr's in arc_read()
#12541 Allow sending corrupt snapshots even if metadata is corrupted
Obtained from: OpenZFS
OpenZFS commit: 4a1195ca5041cbff2a6b025a31937fef84876c52
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/abd.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/abd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/openzfs/module/zfs/abd.c b/sys/contrib/openzfs/module/zfs/abd.c index f306c7a1dcca..bf39cd613330 100644 --- a/sys/contrib/openzfs/module/zfs/abd.c +++ b/sys/contrib/openzfs/module/zfs/abd.c @@ -1066,10 +1066,10 @@ abd_raidz_gen_iterate(abd_t **cabds, abd_t *dabd, switch (parity) { case 3: len = MIN(caiters[2].iter_mapsize, len); - /* falls through */ + fallthrough; case 2: len = MIN(caiters[1].iter_mapsize, len); - /* falls through */ + fallthrough; case 1: len = MIN(caiters[0].iter_mapsize, len); } @@ -1179,11 +1179,11 @@ abd_raidz_rec_iterate(abd_t **cabds, abd_t **tabds, case 3: len = MIN(xiters[2].iter_mapsize, len); len = MIN(citers[2].iter_mapsize, len); - /* falls through */ + fallthrough; case 2: len = MIN(xiters[1].iter_mapsize, len); len = MIN(citers[1].iter_mapsize, len); - /* falls through */ + fallthrough; case 1: len = MIN(xiters[0].iter_mapsize, len); len = MIN(citers[0].iter_mapsize, len); |