summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-12-24 03:08:06 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2021-12-26 23:35:13 -0500
commit96d4c918bf73de742aedc4d5642d105e673617f6 (patch)
tree47011579c87f7c91f40014ed8948de0bf36739b9
parent6928a301bc8b817c9153e0464c1263577b4bfd09 (diff)
bcachefs: Kill ptr_bucket_mark()
Only used in one place, we can just delete it. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/buckets.h20
1 files changed, 7 insertions, 13 deletions
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index ac9b554acd86..50e28fb78e9b 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -91,18 +91,6 @@ static inline enum bch_data_type ptr_data_type(const struct bkey *k,
return ptr->cached ? BCH_DATA_cached : BCH_DATA_user;
}
-static inline struct bucket_mark ptr_bucket_mark(struct bch_dev *ca,
- const struct bch_extent_ptr *ptr)
-{
- struct bucket_mark m;
-
- rcu_read_lock();
- m = READ_ONCE(PTR_BUCKET(ca, ptr, 0)->mark);
- rcu_read_unlock();
-
- return m;
-}
-
static inline int gen_cmp(u8 a, u8 b)
{
return (s8) (a - b);
@@ -122,7 +110,13 @@ static inline int gen_after(u8 a, u8 b)
static inline u8 ptr_stale(struct bch_dev *ca,
const struct bch_extent_ptr *ptr)
{
- return gen_after(ptr_bucket_mark(ca, ptr).gen, ptr->gen);
+ u8 ret;
+
+ rcu_read_lock();
+ ret = gen_after(PTR_BUCKET(ca, ptr, 0)->mark.gen, ptr->gen);
+ rcu_read_unlock();
+
+ return ret;
}
/* bucket gc marks */