From 292f85ca8cb383c0e018b056eca1bfe1e396d693 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 31 Jan 2013 00:54:56 +0000
Subject: [PATCH] --- yaml --- r: 360425 b: refs/heads/master c:
 1c697d4acc2e10b2a65b22abba2687a2897ecd74 h: refs/heads/master i:   360423:
 3353413c4084fe190413fedd4f41c975a9006654 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ctree.c | 1 +
 trunk/fs/btrfs/super.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d215e48c96eb..a37c75639f3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa43a17c21cf35329b1a495dd6876798dd8b016b
+refs/heads/master: 1c697d4acc2e10b2a65b22abba2687a2897ecd74
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
index 6eff0fa9ecaa..35444013f0cf 100644
--- a/trunk/fs/btrfs/ctree.c
+++ b/trunk/fs/btrfs/ctree.c
@@ -1138,6 +1138,7 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,
 		switch (tm->op) {
 		case MOD_LOG_KEY_REMOVE_WHILE_FREEING:
 			BUG_ON(tm->slot < n);
+			/* Fallthrough */
 		case MOD_LOG_KEY_REMOVE_WHILE_MOVING:
 		case MOD_LOG_KEY_REMOVE:
 			btrfs_set_node_key(eb, &tm->key, tm->slot);
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 06537d217419..976f6aac102e 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -437,6 +437,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
 		case Opt_compress_force:
 		case Opt_compress_force_type:
 			compress_force = true;
+			/* Fallthrough */
 		case Opt_compress:
 		case Opt_compress_type:
 			if (token == Opt_compress ||