c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename fallthrough to zfs_fallthrough

Browse Source 
Unfortunately macOS has obj-C keyword "fallthrough" in the OS headers.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Damian Szuberski <szuberskidamian@gmail.com>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #13097
This commit is contained in:
Jorgen Lundman 2022-02-16 01:58:59 +09:00 committed by GitHub
parent ae07fc1393
commit 9a70e97fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mount_zfs/mount_zfs.c
View File

@ -390,7 +390,7 @@ main(int argc, char **argv)
return (MOUNT_SYSERR); return (MOUNT_SYSERR);
} }
#endif #endif
fallthrough; zfs_fallthrough;
default: default:
(void) fprintf(stderr, gettext("filesystem " (void) fprintf(stderr, gettext("filesystem "
"'%s' can not be mounted: %s\n"), dataset, "'%s' can not be mounted: %s\n"), dataset,

2
cmd/zdb/zdb.c
View File

@ -4655,7 +4655,7 @@ dump_path_impl(objset_t *os, uint64_t obj, char *name, uint64_t *retobj)
case DMU_OT_DIRECTORY_CONTENTS: case DMU_OT_DIRECTORY_CONTENTS:
if (s != NULL && *(s + 1) != '\0') if (s != NULL && *(s + 1) != '\0')
return (dump_path_impl(os, child_obj, s + 1, retobj)); return (dump_path_impl(os, child_obj, s + 1, retobj));
fallthrough; zfs_fallthrough;
case DMU_OT_PLAIN_FILE_CONTENTS: case DMU_OT_PLAIN_FILE_CONTENTS:
if (retobj != NULL) { if (retobj != NULL) {
*retobj = child_obj; *retobj = child_obj;

2
cmd/zpool_influxdb/zpool_influxdb.c
View File

@ -118,7 +118,7 @@ escape_string(const char *s)
case '=': case '=':
case '\\': case '\\':
*d++ = '\\'; *d++ = '\\';
fallthrough; zfs_fallthrough;
default: default:
*d = *c; *d = *c;
} }

2
include/os/freebsd/linux/compiler.h
View File

@ -67,7 +67,7 @@
#define __always_inline inline #define __always_inline inline
#define noinline __noinline #define noinline __noinline
#define ____cacheline_aligned __aligned(CACHE_LINE_SIZE) #define ____cacheline_aligned __aligned(CACHE_LINE_SIZE)
#define fallthrough __attribute__((__fallthrough__)) #define zfs_fallthrough __attribute__((__fallthrough__))
#if !defined(_KERNEL) && !defined(_STANDALONE) #if !defined(_KERNEL) && !defined(_STANDALONE)
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)

6
include/os/linux/kernel/linux/compiler_compat.h
View File

@ -28,11 +28,11 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#if !defined(fallthrough) #if !defined(zfs_fallthrough)
#if defined(HAVE_IMPLICIT_FALLTHROUGH) #if defined(HAVE_IMPLICIT_FALLTHROUGH)
#define fallthrough __attribute__((__fallthrough__)) #define zfs_fallthrough __attribute__((__fallthrough__))
#else #else
#define fallthrough ((void)0) #define zfs_fallthrough ((void)0)
#endif #endif
#endif #endif

6
lib/libspl/include/sys/feature_tests.h
View File

@ -30,11 +30,11 @@
#define ____cacheline_aligned #define ____cacheline_aligned
#define __NORETURN __attribute__((__noreturn__)) #define __NORETURN __attribute__((__noreturn__))
#if !defined(fallthrough) && !defined(_LIBCPP_VERSION) #if !defined(zfs_fallthrough) && !defined(_LIBCPP_VERSION)
#if defined(HAVE_IMPLICIT_FALLTHROUGH) #if defined(HAVE_IMPLICIT_FALLTHROUGH)
#define fallthrough __attribute__((__fallthrough__)) #define zfs_fallthrough __attribute__((__fallthrough__))
#else #else
#define fallthrough ((void)0) #define zfs_fallthrough ((void)0)
#endif #endif
#endif #endif

4
lib/libzfs/libzfs_dataset.c
View File

@ -1363,7 +1363,7 @@ badlabel:
(void) zfs_error(hdl, EZFS_BADPROP, errbuf); (void) zfs_error(hdl, EZFS_BADPROP, errbuf);
goto error; goto error;
} }
fallthrough; zfs_fallthrough;
} }
case ZFS_PROP_SHARESMB: case ZFS_PROP_SHARESMB:
@ -3783,7 +3783,7 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type,
if (type == ZFS_TYPE_VOLUME) if (type == ZFS_TYPE_VOLUME)
return (zfs_error(hdl, EZFS_VOLTOOBIG, return (zfs_error(hdl, EZFS_VOLTOOBIG,
errbuf)); errbuf));
fallthrough; zfs_fallthrough;
#endif #endif
default: default:
return (zfs_standard_error(hdl, errno, errbuf)); return (zfs_standard_error(hdl, errno, errbuf));

4
lib/libzfs/libzfs_pool.c
View File

@ -316,7 +316,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf,
len); len);
break; break;
} }
fallthrough; zfs_fallthrough;
default: default:
(void) strlcpy(buf, "-", len); (void) strlcpy(buf, "-", len);
break; break;
@ -407,7 +407,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf,
(void) snprintf(buf, len, "-"); (void) snprintf(buf, len, "-");
break; break;
} }
fallthrough; zfs_fallthrough;
default: default:
(void) snprintf(buf, len, "%llu", (u_longlong_t)intval); (void) snprintf(buf, len, "%llu", (u_longlong_t)intval);
} }

2
lib/libzfs/libzfs_sendrecv.c
View File

@ -4947,7 +4947,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
(void) zfs_error(hdl, EZFS_BUSY, errbuf); (void) zfs_error(hdl, EZFS_BUSY, errbuf);
break; break;
} }
fallthrough; zfs_fallthrough;
default: default:
(void) zfs_standard_error(hdl, ioctl_errno, errbuf); (void) zfs_standard_error(hdl, ioctl_errno, errbuf);
} }

2
lib/libzfs/libzfs_util.c
View File

@ -600,8 +600,8 @@ zfs_setprop_error(libzfs_handle_t *hdl, zfs_prop_t prop, int err,
(void) zfs_error(hdl, EZFS_VOLTOOBIG, errbuf); (void) zfs_error(hdl, EZFS_VOLTOOBIG, errbuf);
break; break;
} }
zfs_fallthrough;
#endif #endif
fallthrough;
default: default:
(void) zfs_standard_error(hdl, err, errbuf); (void) zfs_standard_error(hdl, err, errbuf);
} }

2
lib/libzfsbootenv/lzbe_device.c
View File

@ -63,7 +63,7 @@ lzbe_set_boot_device(const char *pool, lzbe_flags_t flag, const char *device)
/* Drop this nvlist */ /* Drop this nvlist */
fnvlist_free(nv); fnvlist_free(nv);
} }
fallthrough; zfs_fallthrough;
case lzbe_replace: case lzbe_replace:
nv = fnvlist_alloc(); nv = fnvlist_alloc();
break; break;

4
lib/libzutil/zutil_import.c
View File

@ -1032,11 +1032,11 @@ zpool_read_label(int fd, nvlist_t **config, int *num_labels)
// This shouldn't be possible to // This shouldn't be possible to
// encounter, die if we do. // encounter, die if we do.
ASSERT(B_FALSE); ASSERT(B_FALSE);
fallthrough; zfs_fallthrough;
case EOPNOTSUPP: case EOPNOTSUPP:
case ENOSYS: case ENOSYS:
do_slow = B_TRUE; do_slow = B_TRUE;
fallthrough; zfs_fallthrough;
case 0: case 0:
default: default:
(void) aio_return(&aiocbs[l]); (void) aio_return(&aiocbs[l]);

2
module/icp/core/kcf_prov_tabs.c
View File

@ -378,7 +378,7 @@ kcf_provider_zero_refcnt(kcf_provider_desc_t *desc)
mutex_exit(&desc->pd_lock); mutex_exit(&desc->pd_lock);
break; break;
} }
fallthrough; zfs_fallthrough;
case CRYPTO_HW_PROVIDER: case CRYPTO_HW_PROVIDER:
case CRYPTO_LOGICAL_PROVIDER: case CRYPTO_LOGICAL_PROVIDER:

2
module/icp/io/aes.c
View File

@ -952,7 +952,7 @@ aes_encrypt_atomic(crypto_provider_handle_t provider,
case AES_GMAC_MECH_INFO_TYPE: case AES_GMAC_MECH_INFO_TYPE:
if (plaintext->cd_length != 0) if (plaintext->cd_length != 0)
return (CRYPTO_ARGUMENTS_BAD); return (CRYPTO_ARGUMENTS_BAD);
fallthrough; zfs_fallthrough;
case AES_GCM_MECH_INFO_TYPE: case AES_GCM_MECH_INFO_TYPE:
length_needed = plaintext->cd_length + aes_ctx.ac_tag_len; length_needed = plaintext->cd_length + aes_ctx.ac_tag_len;
break; break;

2
module/lua/lgc.c
View File

@ -675,7 +675,7 @@ static void freeobj (lua_State *L, GCObject *o) {
case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break; case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
case LUA_TSHRSTR: case LUA_TSHRSTR:
G(L)->strt.nuse--; G(L)->strt.nuse--;
fallthrough; zfs_fallthrough;
case LUA_TLNGSTR: { case LUA_TLNGSTR: {
luaM_freemem(L, o, sizestring(gco2ts(o))); luaM_freemem(L, o, sizestring(gco2ts(o)));
break; break;

2
module/lua/llex.c
View File

@ -476,7 +476,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
else if (!lisdigit(ls->current)) return '.'; else if (!lisdigit(ls->current)) return '.';
/* else go through */ /* else go through */
} }
fallthrough; zfs_fallthrough;
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': { case '5': case '6': case '7': case '8': case '9': {
read_numeral(ls, seminfo); read_numeral(ls, seminfo);

2
module/lua/lstrlib.c
View File

@ -500,7 +500,7 @@ static const char *match (MatchState *ms, const char *s, const char *p) {
} }
case '+': /* 1 or more repetitions */ case '+': /* 1 or more repetitions */
s++; /* 1 match already done */ s++; /* 1 match already done */
fallthrough; zfs_fallthrough;
case '*': /* 0 or more repetitions */ case '*': /* 0 or more repetitions */
s = max_expand(ms, s, p, ep); s = max_expand(ms, s, p, ep);
break; break;

2
module/lua/ltable.c
View File

@ -491,7 +491,7 @@ const TValue *luaH_get (Table *t, const TValue *key) {
return luaH_getint(t, k); /* use specialized version */ return luaH_getint(t, k); /* use specialized version */
/* else go through */ /* else go through */
} }
fallthrough; zfs_fallthrough;
default: { default: {
Node *n = mainposition(t, key); Node *n = mainposition(t, key);
do { /* check whether `key' is somewhere in the chain */ do { /* check whether `key' is somewhere in the chain */

4
module/os/freebsd/zfs/zfs_acl.c
View File

@ -269,7 +269,7 @@ zfs_ace_fuid_size(void *acep)
entry_type == OWNING_GROUP || entry_type == OWNING_GROUP ||
entry_type == ACE_EVERYONE) entry_type == ACE_EVERYONE)
return (sizeof (zfs_ace_hdr_t)); return (sizeof (zfs_ace_hdr_t));
fallthrough; zfs_fallthrough;
default: default:
return (sizeof (zfs_ace_t)); return (sizeof (zfs_ace_t));
} }
@ -2153,7 +2153,7 @@ zfs_zaccess_aces_check(znode_t *zp, uint32_t *working_mode,
break; break;
case OWNING_GROUP: case OWNING_GROUP:
who = gowner; who = gowner;
fallthrough; zfs_fallthrough;
case ACE_IDENTIFIER_GROUP: case ACE_IDENTIFIER_GROUP:
checkit = zfs_groupmember(zfsvfs, who, cr); checkit = zfs_groupmember(zfsvfs, who, cr);
break; break;

2
module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -966,7 +966,7 @@ zfs_lookup(vnode_t *dvp, const char *nm, vnode_t **vpp,
cnp->cn_flags |= SAVENAME; cnp->cn_flags |= SAVENAME;
break; break;
} }
fallthrough; zfs_fallthrough;
case DELETE: case DELETE:
if (error == 0) if (error == 0)
cnp->cn_flags |= SAVENAME; cnp->cn_flags |= SAVENAME;

4
module/os/linux/zfs/zfs_acl.c
View File

@ -269,7 +269,7 @@ zfs_ace_fuid_size(void *acep)
entry_type == OWNING_GROUP || entry_type == OWNING_GROUP ||
entry_type == ACE_EVERYONE) entry_type == ACE_EVERYONE)
return (sizeof (zfs_ace_hdr_t)); return (sizeof (zfs_ace_hdr_t));
fallthrough; zfs_fallthrough;
default: default:
return (sizeof (zfs_ace_t)); return (sizeof (zfs_ace_t));
} }
@ -2317,7 +2317,7 @@ zfs_zaccess_aces_check(znode_t *zp, uint32_t *working_mode,
break; break;
case OWNING_GROUP: case OWNING_GROUP:
who = gowner; who = gowner;
fallthrough; zfs_fallthrough;
case ACE_IDENTIFIER_GROUP: case ACE_IDENTIFIER_GROUP:
checkit = zfs_groupmember(zfsvfs, who, cr); checkit = zfs_groupmember(zfsvfs, who, cr);
break; break;

2
module/os/linux/zfs/zfs_znode.c
View File

@ -430,7 +430,7 @@ zfs_inode_set_ops(zfsvfs_t *zfsvfs, struct inode *ip)
case S_IFBLK: case S_IFBLK:
(void) sa_lookup(ITOZ(ip)->z_sa_hdl, SA_ZPL_RDEV(zfsvfs), &rdev, (void) sa_lookup(ITOZ(ip)->z_sa_hdl, SA_ZPL_RDEV(zfsvfs), &rdev,
sizeof (rdev)); sizeof (rdev));
fallthrough; zfs_fallthrough;
case S_IFIFO: case S_IFIFO:
case S_IFSOCK: case S_IFSOCK:
init_special_inode(ip, ip->i_mode, rdev); init_special_inode(ip, ip->i_mode, rdev);

8
module/zfs/abd.c
View File

@ -1066,10 +1066,10 @@ abd_raidz_gen_iterate(abd_t **cabds, abd_t *dabd,
switch (parity) { switch (parity) {
case 3: case 3:
len = MIN(caiters[2].iter_mapsize, len); len = MIN(caiters[2].iter_mapsize, len);
fallthrough; zfs_fallthrough;
case 2: case 2:
len = MIN(caiters[1].iter_mapsize, len); len = MIN(caiters[1].iter_mapsize, len);
fallthrough; zfs_fallthrough;
case 1: case 1:
len = MIN(caiters[0].iter_mapsize, len); len = MIN(caiters[0].iter_mapsize, len);
} }
@ -1179,11 +1179,11 @@ abd_raidz_rec_iterate(abd_t **cabds, abd_t **tabds,
case 3: case 3:
len = MIN(xiters[2].iter_mapsize, len); len = MIN(xiters[2].iter_mapsize, len);
len = MIN(citers[2].iter_mapsize, len); len = MIN(citers[2].iter_mapsize, len);
fallthrough; zfs_fallthrough;
case 2: case 2:
len = MIN(xiters[1].iter_mapsize, len); len = MIN(xiters[1].iter_mapsize, len);
len = MIN(citers[1].iter_mapsize, len); len = MIN(citers[1].iter_mapsize, len);
fallthrough; zfs_fallthrough;
case 1: case 1:
len = MIN(xiters[0].iter_mapsize, len); len = MIN(xiters[0].iter_mapsize, len);
len = MIN(citers[0].iter_mapsize, len); len = MIN(citers[0].iter_mapsize, len);

2
module/zfs/dsl_prop.c
View File

@ -749,7 +749,7 @@ dsl_prop_set_sync_impl(dsl_dataset_t *ds, const char *propname,
ASSERT(err == 0 || err == ENOENT); ASSERT(err == 0 || err == ENOENT);
err = zap_remove(mos, zapobj, inheritstr, tx); err = zap_remove(mos, zapobj, inheritstr, tx);
ASSERT(err == 0 || err == ENOENT); ASSERT(err == 0 || err == ENOENT);
fallthrough; zfs_fallthrough;
case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED): case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED):
/* /*
* remove propname$recvd * remove propname$recvd

2
module/zfs/spa.c
View File

@ -9729,7 +9729,7 @@ spa_activity_in_progress(spa_t *spa, zpool_wait_activity_t activity,
case ZPOOL_WAIT_RESILVER: case ZPOOL_WAIT_RESILVER:
if ((*in_progress = vdev_rebuild_active(spa->spa_root_vdev))) if ((*in_progress = vdev_rebuild_active(spa->spa_root_vdev)))
break; break;
fallthrough; zfs_fallthrough;
case ZPOOL_WAIT_SCRUB: case ZPOOL_WAIT_SCRUB:
{ {
boolean_t scanning, paused, is_scrub; boolean_t scanning, paused, is_scrub;

2
module/zfs/vdev_label.c
View File

@ -1324,7 +1324,7 @@ vdev_label_read_bootenv(vdev_t *rvd, nvlist_t *bootenv)
nvlist_free(config); nvlist_free(config);
break; break;
} }
fallthrough; zfs_fallthrough;
default: default:
/* Check for FreeBSD zfs bootonce command string */ /* Check for FreeBSD zfs bootonce command string */
buf = abd_to_buf(abd); buf = abd_to_buf(abd);

2
module/zfs/vdev_raidz_math_scalar.c
View File

@ -142,7 +142,7 @@ static const struct {
a.b[6] = mul_lt[a.b[6]]; \ a.b[6] = mul_lt[a.b[6]]; \
a.b[5] = mul_lt[a.b[5]]; \ a.b[5] = mul_lt[a.b[5]]; \
a.b[4] = mul_lt[a.b[4]]; \ a.b[4] = mul_lt[a.b[4]]; \
fallthrough; \ zfs_fallthrough; \
case 4: \ case 4: \
a.b[3] = mul_lt[a.b[3]]; \ a.b[3] = mul_lt[a.b[3]]; \
a.b[2] = mul_lt[a.b[2]]; \ a.b[2] = mul_lt[a.b[2]]; \

8
module/zfs/zfs_replay.c
View File

@ -362,7 +362,7 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap)
zfsvfs->z_fuid_replay = zfs_replay_fuids(fuidstart, zfsvfs->z_fuid_replay = zfs_replay_fuids(fuidstart,
(void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt, (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt,
lr->lr_uid, lr->lr_gid); lr->lr_uid, lr->lr_gid);
fallthrough; zfs_fallthrough;
case TX_CREATE_ACL_ATTR: case TX_CREATE_ACL_ATTR:
if (name == NULL) { if (name == NULL) {
lrattr = (lr_attr_t *)(caddr_t)(lracl + 1); 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, zfsvfs->z_fuid_replay = zfs_replay_fuids(fuidstart,
(void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt, (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt,
lr->lr_uid, lr->lr_gid); lr->lr_uid, lr->lr_gid);
fallthrough; zfs_fallthrough;
case TX_MKDIR_ACL_ATTR: case TX_MKDIR_ACL_ATTR:
if (name == NULL) { if (name == NULL) {
lrattr = (lr_attr_t *)(caddr_t)(lracl + 1); 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, zfs_replay_fuid_domain(start, &start,
lr->lr_uid, lr->lr_gid); lr->lr_uid, lr->lr_gid);
name = (char *)start; name = (char *)start;
fallthrough; zfs_fallthrough;
case TX_CREATE: case TX_CREATE:
if (name == NULL) if (name == NULL)
@ -537,7 +537,7 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap)
zfs_replay_fuid_domain(start, &start, zfs_replay_fuid_domain(start, &start,
lr->lr_uid, lr->lr_gid); lr->lr_uid, lr->lr_gid);
name = (char *)start; name = (char *)start;
fallthrough; zfs_fallthrough;
case TX_MKDIR: case TX_MKDIR:
if (name == NULL) if (name == NULL)

2
tests/zfs-tests/cmd/mkbusy/mkbusy.c
View File

@ -136,7 +136,7 @@ main(int argc, char *argv[])
switch (sbuf.st_mode & S_IFMT) { switch (sbuf.st_mode & S_IFMT) {
case S_IFDIR: case S_IFDIR:
isdir = B_TRUE; isdir = B_TRUE;
fallthrough; zfs_fallthrough;
case S_IFLNK: case S_IFLNK:
case S_IFCHR: case S_IFCHR:
case S_IFBLK: case S_IFBLK: