Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Normalise /*FALLTHR{OUGH,U}*/ 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Issue #12201
This commit is contained in:
наб 2021-06-05 15:07:38 +02:00 committed by Brian Behlendorf
parent 90f1c3c946
commit 2c69ba6444
15 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mount_zfs/mount_zfs.c
View File

@ -368,8 +368,8 @@ main(int argc, char **argv)
"mount the filesystem again.\n"), dataset); "mount the filesystem again.\n"), dataset);
return (MOUNT_SYSERR); return (MOUNT_SYSERR);
} }
/* fallthru */
#endif #endif
/* 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

@ -4612,7 +4612,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*/ /* 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;

1
cmd/zfs/zfs_main.c
View File

@ -4510,7 +4510,6 @@ zfs_do_send(int argc, char **argv)
usage(B_FALSE); usage(B_FALSE);
break; break;
case '?': case '?':
/*FALLTHROUGH*/
default: default:
/* /*
* If an invalid flag was passed, optopt contains the * If an invalid flag was passed, optopt contains the

1
cmd/zpool_influxdb/zpool_influxdb.c
View File

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

2
lib/libzfs/libzfs_dataset.c
View File

@ -1364,8 +1364,8 @@ badlabel:
goto error; goto error;
} }
} }
/* FALLTHROUGH */
/*FALLTHRU*/
case ZFS_PROP_SHARESMB: case ZFS_PROP_SHARESMB:
case ZFS_PROP_SHARENFS: case ZFS_PROP_SHARENFS:

1
lib/libzutil/zutil_import.c
View File

@ -1035,6 +1035,7 @@ zpool_read_label(int fd, nvlist_t **config, int *num_labels)
case EOPNOTSUPP: case EOPNOTSUPP:
case ENOSYS: case ENOSYS:
do_slow = B_TRUE; do_slow = B_TRUE;
/* 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

@ -377,7 +377,7 @@ kcf_provider_zero_refcnt(kcf_provider_desc_t *desc)
mutex_exit(&desc->pd_lock); mutex_exit(&desc->pd_lock);
break; break;
} }
/* FALLTHRU */ /* 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

@ -976,7 +976,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);
/* FALLTHRU */ /* 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/llex.c
View File

@ -477,7 +477,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 */ /* 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/ltable.c
View File

@ -492,7 +492,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 */ /* 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*/ /* 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*/ /* FALLTHROUGH */
case ACE_IDENTIFIER_GROUP: case ACE_IDENTIFIER_GROUP:
checkit = zfs_groupmember(zfsvfs, who, cr); checkit = zfs_groupmember(zfsvfs, who, cr);
break; break;

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*/ /* 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*/ /* 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*/ /* 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);

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);
/* FALLTHRU */ /* FALLTHROUGH */
case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED): case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED):
/* /*
* remove propname$recvd * remove propname$recvd

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*/ /* 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*/ /* 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,8 +519,8 @@ 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 */
/*FALLTHROUGH*/
case TX_CREATE: case TX_CREATE:
if (name == NULL) if (name == NULL)
name = (char *)start; name = (char *)start;
@ -537,8 +537,8 @@ 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 */
/*FALLTHROUGH*/
case TX_MKDIR: case TX_MKDIR:
if (name == NULL) if (name == NULL)
name = (char *)(lr + 1); name = (char *)(lr + 1);