1 files changed, 25 insertions, 23 deletions

diff --git a/libbcachefs/ec.c b/libbcachefs/ec.c
index 848f5dcb..bdb18c2a 100644
--- a/libbcachefs/ec.c
+++ b/libbcachefs/ec.c
@@ -162,19 +162,20 @@ static int extent_matches_stripe(struct bch_fs *c,
 				 struct bch_stripe *v,
 				 struct bkey_s_c k)
 {
-	struct bkey_s_c_extent e;
-	const struct bch_extent_ptr *ptr;
-	int idx;
 
-	if (!bkey_extent_is_data(k.k))
-		return -1;
-
-	e = bkey_s_c_to_extent(k);
+	switch (k.k->type) {
+	case KEY_TYPE_extent: {
+		struct bkey_s_c_extent e = bkey_s_c_to_extent(k);
+		const struct bch_extent_ptr *ptr;
+		int idx;
 
-	extent_for_each_ptr(e, ptr) {
-		idx = ptr_matches_stripe(c, v, ptr);
-		if (idx >= 0)
-			return idx;
+		extent_for_each_ptr(e, ptr) {
+			idx = ptr_matches_stripe(c, v, ptr);
+			if (idx >= 0)
+				return idx;
+		}
+		break;
+	}
 	}
 
 	return -1;
@@ -182,19 +183,20 @@ static int extent_matches_stripe(struct bch_fs *c,
 
 static bool extent_has_stripe_ptr(struct bkey_s_c k, u64 idx)
 {
-	struct bkey_s_c_extent e;
-	const union bch_extent_entry *entry;
+	switch (k.k->type) {
+	case KEY_TYPE_extent: {
+		struct bkey_s_c_extent e = bkey_s_c_to_extent(k);
+		const union bch_extent_entry *entry;
 
-	if (!bkey_extent_is_data(k.k))
-		return false;
+		extent_for_each_entry(e, entry)
+			if (extent_entry_type(entry) ==
+			    BCH_EXTENT_ENTRY_stripe_ptr &&
+			    entry->stripe_ptr.idx == idx)
+				return true;
 
-	e = bkey_s_c_to_extent(k);
-
-	extent_for_each_entry(e, entry)
-		if (extent_entry_type(entry) ==
-		    BCH_EXTENT_ENTRY_stripe_ptr &&
-		    entry->stripe_ptr.idx == idx)
-			return true;
+		break;
+	}
+	}
 
 	return false;
 }
@@ -1310,7 +1312,7 @@ int bch2_stripes_read(struct bch_fs *c, struct journal_keys *journal_keys)
 			break;
 		}
 
-		bch2_mark_key(c, k, 0, NULL, 0,
+		bch2_mark_key(c, k, 0, 0, NULL, 0,
 			      BCH_BUCKET_MARK_ALLOC_READ|
 			      BCH_BUCKET_MARK_NOATOMIC);
 	}