aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-25 21:49:36 +0200
committerIngo Molnar <mingo@kernel.org>2020-07-25 21:49:36 +0200
commitc84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (patch)
tree30f7f845afc8e0428c1fbb1bc93f52b120d40661 /fs/btrfs/ctree.c
parent9a71df495c3d29dab596bb590e73fd8b20106e2d (diff)
parentba47d845d715a010f7b51f6f89bae32845e6acb7 (diff)
downloadkernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.gz
kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.bz2
kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.zip
Merge tag 'v5.8-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r--fs/btrfs/ctree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 3a7648bff42c..82ab6e5a386d 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1196,7 +1196,7 @@ __tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct extent_buffer *eb,
switch (tm->op) {
case MOD_LOG_KEY_REMOVE_WHILE_FREEING:
BUG_ON(tm->slot < n);
- /* Fallthrough */
+ fallthrough;
case MOD_LOG_KEY_REMOVE_WHILE_MOVING:
case MOD_LOG_KEY_REMOVE:
btrfs_set_node_key(eb, &tm->key, tm->slot);