ext4: change to use fallthrough macro

Shijie Luo · tytso · commit 70d7ced2ed4d · 2020-08-18T14:27:40.000-04:00
Change to use fallthrough macro in switch case. Signed-off-by: Shijie Luo <luoshijie1@huawei.com> Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com> Link: https://lore.kernel.org/r/20200810114435.24182-1-luoshijie1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c
@@ -233,7 +233,7 @@ static int __ext4fs_dirhash(const char *name, int len,
 		break;
 	case DX_HASH_HALF_MD4_UNSIGNED:
 		str2hashbuf = str2hashbuf_unsigned;
-		/* fall through */
+		fallthrough;
 	case DX_HASH_HALF_MD4:
 		p = name;
 		while (len > 0) {
@@ -247,7 +247,7 @@ static int __ext4fs_dirhash(const char *name, int len,
 		break;
 	case DX_HASH_TEA_UNSIGNED:
 		str2hashbuf = str2hashbuf_unsigned;
-		/* fall through */
+		fallthrough;
 	case DX_HASH_TEA:
 		p = name;
 		while (len > 0) {
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
@@ -1180,21 +1180,21 @@ void ext4_ind_truncate(handle_t *handle, struct inode *inode)
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
 			i_data[EXT4_IND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_IND_BLOCK:
 		nr = i_data[EXT4_DIND_BLOCK];
 		if (nr) {
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
 			i_data[EXT4_DIND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_DIND_BLOCK:
 		nr = i_data[EXT4_TIND_BLOCK];
 		if (nr) {
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
 			i_data[EXT4_TIND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_TIND_BLOCK:
 		;
 	}
@@ -1434,7 +1434,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);
 			i_data[EXT4_IND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_IND_BLOCK:
 		if (++n >= n2)
 			break;
@@ -1443,7 +1443,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);
 			i_data[EXT4_DIND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_DIND_BLOCK:
 		if (++n >= n2)
 			break;
@@ -1452,7 +1452,7 @@ int ext4_ind_remove_space(handle_t *handle, struct inode *inode,
 			ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);
 			i_data[EXT4_TIND_BLOCK] = 0;
 		}
-		/* fall through */
+		fallthrough;
 	case EXT4_TIND_BLOCK:
 		;
 	}
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
@@ -140,15 +140,15 @@ static void bio_post_read_processing(struct bio_post_read_ctx *ctx)
 			return;
 		}
 		ctx->cur_step++;
-		/* fall-through */
+		fallthrough;
 	case STEP_VERITY:
 		if (ctx->enabled_steps & (1 << STEP_VERITY)) {
 			INIT_WORK(&ctx->work, verity_work);
 			fsverity_enqueue_verify_work(&ctx->work);
 			return;
 		}
 		ctx->cur_step++;
-		/* fall-through */
+		fallthrough;
 	default:
 		__read_end_io(ctx->bio);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1180,21 +1180,21 @@ void ext4_ind_truncate(handle_t handle, struct inode inode)`
`1180`	`1180`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);`
`1181`	`1181`	`i_data[EXT4_IND_BLOCK] = 0;`
`1182`	`1182`	`}`
`1183`		`- /* fall through */`
	`1183`	`+ fallthrough;`
`1184`	`1184`	`case EXT4_IND_BLOCK:`
`1185`	`1185`	`nr = i_data[EXT4_DIND_BLOCK];`
`1186`	`1186`	`if (nr) {`
`1187`	`1187`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);`
`1188`	`1188`	`i_data[EXT4_DIND_BLOCK] = 0;`
`1189`	`1189`	`}`
`1190`		`- /* fall through */`
	`1190`	`+ fallthrough;`
`1191`	`1191`	`case EXT4_DIND_BLOCK:`
`1192`	`1192`	`nr = i_data[EXT4_TIND_BLOCK];`
`1193`	`1193`	`if (nr) {`
`1194`	`1194`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);`
`1195`	`1195`	`i_data[EXT4_TIND_BLOCK] = 0;`
`1196`	`1196`	`}`
`1197`		`- /* fall through */`
	`1197`	`+ fallthrough;`
`1198`	`1198`	`case EXT4_TIND_BLOCK:`
`1199`	`1199`	`;`
`1200`	`1200`	`}`
`@@ -1434,7 +1434,7 @@ int ext4_ind_remove_space(handle_t handle, struct inode inode,`
`1434`	`1434`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1);`
`1435`	`1435`	`i_data[EXT4_IND_BLOCK] = 0;`
`1436`	`1436`	`}`
`1437`		`- /* fall through */`
	`1437`	`+ fallthrough;`
`1438`	`1438`	`case EXT4_IND_BLOCK:`
`1439`	`1439`	`if (++n >= n2)`
`1440`	`1440`	`break;`
`@@ -1443,7 +1443,7 @@ int ext4_ind_remove_space(handle_t handle, struct inode inode,`
`1443`	`1443`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 2);`
`1444`	`1444`	`i_data[EXT4_DIND_BLOCK] = 0;`
`1445`	`1445`	`}`
`1446`		`- /* fall through */`
	`1446`	`+ fallthrough;`
`1447`	`1447`	`case EXT4_DIND_BLOCK:`
`1448`	`1448`	`if (++n >= n2)`
`1449`	`1449`	`break;`
`@@ -1452,7 +1452,7 @@ int ext4_ind_remove_space(handle_t handle, struct inode inode,`
`1452`	`1452`	`ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3);`
`1453`	`1453`	`i_data[EXT4_TIND_BLOCK] = 0;`
`1454`	`1454`	`}`
`1455`		`- /* fall through */`
	`1455`	`+ fallthrough;`
`1456`	`1456`	`case EXT4_TIND_BLOCK:`
`1457`	`1457`	`;`
`1458`	`1458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,15 +140,15 @@ static void bio_post_read_processing(struct bio_post_read_ctx *ctx)`
`140`	`140`	`return;`
`141`	`141`	`}`
`142`	`142`	`ctx->cur_step++;`
`143`		`- /* fall-through */`
	`143`	`+ fallthrough;`
`144`	`144`	`case STEP_VERITY:`
`145`	`145`	`if (ctx->enabled_steps & (1 << STEP_VERITY)) {`
`146`	`146`	`INIT_WORK(&ctx->work, verity_work);`
`147`	`147`	`fsverity_enqueue_verify_work(&ctx->work);`
`148`	`148`	`return;`
`149`	`149`	`}`
`150`	`150`	`ctx->cur_step++;`
`151`		`- /* fall-through */`
	`151`	`+ fallthrough;`
`152`	`152`	`default:`
`153`	`153`	`__read_end_io(ctx->bio);`
`154`	`154`	`}`