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/zfs_replay.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/zfs_replay.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/zfs_replay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/openzfs/module/zfs/zfs_replay.c b/sys/contrib/openzfs/module/zfs/zfs_replay.c index 9073888dbab6..e6ed3e738e40 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_replay.c +++ b/sys/contrib/openzfs/module/zfs/zfs_replay.c @@ -362,7 +362,7 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) zfsvfs->z_fuid_replay = zfs_replay_fuids(fuidstart, (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt, lr->lr_uid, lr->lr_gid); - /* FALLTHROUGH */ + fallthrough; case TX_CREATE_ACL_ATTR: if (name == NULL) { lrattr = (lr_attr_t *)(caddr_t)(lracl + 1); @@ -394,7 +394,7 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) zfsvfs->z_fuid_replay = zfs_replay_fuids(fuidstart, (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt, lr->lr_uid, lr->lr_gid); - /* FALLTHROUGH */ + fallthrough; case TX_MKDIR_ACL_ATTR: if (name == NULL) { lrattr = (lr_attr_t *)(caddr_t)(lracl + 1); @@ -519,7 +519,7 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap) zfs_replay_fuid_domain(start, &start, lr->lr_uid, lr->lr_gid); name = (char *)start; - /* FALLTHROUGH */ + fallthrough; case TX_CREATE: if (name == NULL) @@ -537,7 +537,7 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap) zfs_replay_fuid_domain(start, &start, lr->lr_uid, lr->lr_gid); name = (char *)start; - /* FALLTHROUGH */ + fallthrough; case TX_MKDIR: if (name == NULL) |