misc: convert utilities to use "fallthrough;"

Now that we have a macro to virtualize switch statement fallthroughs for
lazy compiler linters, we might as well spread it elsewhere.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/type.c b/db/type.c
index 572ac6d6d41725c31eba931bff93dfe1d51976f7..f8d8b5551d32b3331662e875fcdf04f4e02cb5e5 100644 (file)
--- a/db/type.c
+++ b/db/type.c
@@ -307,7 +307,7 @@ handle_text(
 {
        switch (action) {
        case DB_FUZZ:
-               /* fall through */
+               fallthrough;
        case DB_WRITE:
                dbprintf(_("text writing/fuzzing not supported.\n"));
                break;

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index d45ba703cc6fccc448b7bd2dc8cda6c8d98f70cb..683961f6b9cf522709ffc7a5656a2d6d46533afe 100644 (file)
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -78,7 +78,7 @@ main(int argc, char **argv)
                switch (c) {
                case 'D':
                        dsize = strtoll(optarg, NULL, 10);
-                       /* fall through */
+                       fallthrough;
                case 'd':
                        dflag = 1;
                        break;
@@ -91,7 +91,7 @@ main(int argc, char **argv)
                        break;
                case 'L':
                        lsize = strtoll(optarg, NULL, 10);
-                       /* fall through */
+                       fallthrough;
                case 'l':
                        lflag = 1;
                        break;
@@ -107,7 +107,7 @@ main(int argc, char **argv)
                        break;
                case 'R':
                        rsize = strtoll(optarg, NULL, 10);
-                       /* fall through */
+                       fallthrough;
                case 'r':
                        rflag = 1;
                        break;

diff --git a/repair/dinode.c b/repair/dinode.c
index 1fd209547d241b855a1f4a9485808351d8a0a935..f39ab2dceb563185812aebaa5dc1f875829b6bf3 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -531,7 +531,7 @@ _("Fatal error: inode %" PRIu64 " - blkmap_set_ext(): %s\n"
                                do_warn(
 _("%s fork in ino %" PRIu64 " claims free block %" PRIu64 "\n"),
                                        forkname, ino, (uint64_t) b);
-                               /* fall through ... */
+                               fallthrough;
                        case XR_E_INUSE1:       /* seen by rmap */
                        case XR_E_UNKNOWN:
                                break;
@@ -543,7 +543,7 @@ _("%s fork in ino %" PRIu64 " claims free block %" PRIu64 "\n"),
                        case XR_E_INO1:
                        case XR_E_INUSE_FS1:
                                do_warn(_("rmap claims metadata use!\n"));
-                               /* fall through */
+                               fallthrough;
                        case XR_E_FS_MAP:
                        case XR_E_INO:
                        case XR_E_INUSE_FS:
@@ -1674,9 +1674,9 @@ _("directory inode %" PRIu64 " has bad size %" PRId64 "\n"),
                }
                break;
 
-       case XR_INO_CHRDEV:     /* fall through to FIFO case ... */
-       case XR_INO_BLKDEV:     /* fall through to FIFO case ... */
-       case XR_INO_SOCK:       /* fall through to FIFO case ... */
+       case XR_INO_CHRDEV:
+       case XR_INO_BLKDEV:
+       case XR_INO_SOCK:
        case XR_INO_FIFO:
                if (process_misc_ino_types(mp, dino, lino, type))
                        return 1;
@@ -1751,8 +1751,8 @@ _("bad attr fork offset %d in dev inode %" PRIu64 ", should be %d\n"),
                        return 1;
                }
                break;
-       case XFS_DINODE_FMT_LOCAL:      /* fall through ... */
-       case XFS_DINODE_FMT_EXTENTS:    /* fall through ... */
+       case XFS_DINODE_FMT_LOCAL:
+       case XFS_DINODE_FMT_EXTENTS:
        case XFS_DINODE_FMT_BTREE:
                if (dino->di_forkoff >= (XFS_LITINO(mp) >> 3)) {
                        do_warn(
@@ -1908,7 +1908,7 @@ process_inode_data_fork(
                        totblocks, nextents, dblkmap, XFS_DATA_FORK,
                        check_dups);
                break;
-       case XFS_DINODE_FMT_DEV:        /* fall through */
+       case XFS_DINODE_FMT_DEV:
                err = 0;
                break;
        default:
@@ -1946,7 +1946,7 @@ process_inode_data_fork(
                                dirty, totblocks, nextents, dblkmap,
                                XFS_DATA_FORK, 0);
                        break;
-               case XFS_DINODE_FMT_DEV:        /* fall through */
+               case XFS_DINODE_FMT_DEV:
                        err = 0;
                        break;
                default:

diff --git a/repair/phase4.c b/repair/phase4.c
index 191b484262af1c300f6a29a73c048d9cd32d5b28..eb0430020d6404f610414fac739f84deb9ea24a7 100644 (file)
--- a/repair/phase4.c
+++ b/repair/phase4.c
@@ -317,7 +317,7 @@ phase4(xfs_mount_t *mp)
                                do_warn(
                                _("unknown block state, ag %d, blocks %u-%u\n"),
                                        i, j, j + blen - 1);
-                               /* fall through .. */
+                               fallthrough;
                        case XR_E_UNKNOWN:
                        case XR_E_FREE:
                        case XR_E_INUSE:
@@ -349,7 +349,7 @@ phase4(xfs_mount_t *mp)
                        do_warn(
        _("unknown rt extent state, extent %" PRIu64 "\n"),
                                bno);
-                       /* fall through .. */
+                       fallthrough;
                case XR_E_UNKNOWN:
                case XR_E_FREE1:
                case XR_E_FREE:

diff --git a/repair/scan.c b/repair/scan.c
index 2c25af5784cd46e47b9729a8c14f237d6bee640f..52de8a04c8bfead5bd53fb710abc50e5d0de843b 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -732,7 +732,7 @@ _("%s freespace btree block claimed (state %d), agno %d, bno %d, suspect %d\n"),
                                                             XR_E_FREE);
                                                break;
                                        }
-                                       /* fall through */
+                                       fallthrough;
                                default:
                                        do_warn(
        _("block (%d,%d-%d) multiply claimed by %s space tree, state - %d\n"),
@@ -911,7 +911,7 @@ _("in use block (%d,%d-%d) mismatch in %s tree, state - %d,%" PRIx64 "\n"),
                if (xfs_sb_version_hasreflink(&mp->m_sb) &&
                    !XFS_RMAP_NON_INODE_OWNER(owner))
                        break;
-               /* fall through */
+               fallthrough;
        default:
                do_warn(
 _("unknown block (%d,%d-%d) mismatch on %s tree, state - %d,%" PRIx64 "\n"),

diff --git a/scrub/inodes.c b/scrub/inodes.c
index cc73da7f2008b224aaed4fe8731ccf18170b9db8..80af8a747cdd5d2caf8e396795e883c4664d54a1 100644 (file)
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -204,7 +204,7 @@ _("Changed too many times during scan; giving up."));
                        }
                        case ECANCELED:
                                error = 0;
-                               /* fall thru */
+                               fallthrough;
                        default:
                                goto err;
                        }

diff --git a/scrub/repair.c b/scrub/repair.c
index 2c1644c3e487eeedb4b167788b92adf3f9e74ac1..1ef6372e868def63f56137fc1218f254a0491dc2 100644 (file)
--- a/scrub/repair.c
+++ b/scrub/repair.c
@@ -133,7 +133,7 @@ action_list_find_mustfix(
                        alist->nr--;
                        list_move_tail(&aitem->list, &immediate_alist->list);
                        immediate_alist->nr++;
-                       /* fall through */
+                       fallthrough;
                case XFS_SCRUB_TYPE_BNOBT:
                case XFS_SCRUB_TYPE_CNTBT:
                case XFS_SCRUB_TYPE_REFCNTBT:

diff --git a/scrub/scrub.c b/scrub/scrub.c
index aec2d5d5136c09664791285a08406fe7b5176830..a4b7084e47e7f91816a722e79893f78fce481254 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -164,7 +164,7 @@ _("Filesystem is shut down, aborting."));
                 * and the other two should be reported via sm_flags.
                 */
                str_liberror(ctx, error, _("Kernel bug"));
-               /* fall through */
+               fallthrough;
        default:
                /* Operational error. */
                str_errno(ctx, descr_render(&dsc));
@@ -316,7 +316,7 @@ scrub_meta_type(
                ret = scrub_save_repair(ctx, alist, &meta);
                if (ret)
                        return ret;
-               /* fall through */
+               fallthrough;
        case CHECK_DONE:
                return 0;
        default:
@@ -741,7 +741,7 @@ _("Filesystem is shut down, aborting."));
                if (is_unoptimized(&oldm) ||
                    debug_tweak_on("XFS_SCRUB_FORCE_REPAIR"))
                        return CHECK_DONE;
-               /* fall through */
+               fallthrough;
        case EINVAL:
                /* Kernel doesn't know how to repair this? */
                str_corrupt(ctx, descr_render(&dsc),
@@ -761,7 +761,7 @@ _("Read-only filesystem; cannot make changes."));
                /* Don't care if preen fails due to low resources. */
                if (is_unoptimized(&oldm) && !needs_repair(&oldm))
                        return CHECK_DONE;
-               /* fall through */
+               fallthrough;
        default:
                /*
                 * Operational error.  If the caller doesn't want us