Update bcachefs sources to f70a3402188e bcachefs: Fix ca->oldest_gen allocation

[bcachefs-tools-debian] / libbcachefs / alloc_types.h

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index c33a29954e59a4f25f374f11a1003bed9c7dacfb..b91b7a46105608d089828db3bd65d1cc359475af 100644 (file)
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -32,7 +32,7 @@ enum bch_watermark {
 };
 
 #define BCH_WATERMARK_BITS     3
-#define BCH_WATERMARK_MASK     ~(~0 << BCH_WATERMARK_BITS)
+#define BCH_WATERMARK_MASK     ~(~0U << BCH_WATERMARK_BITS)
 
 #define OPEN_BUCKETS_COUNT     1024
 
@@ -105,7 +105,7 @@ struct write_point {
                struct dev_stripe_state stripe;
 
                u64                     sectors_allocated;
-       } __attribute__((__aligned__(SMP_CACHE_BYTES)));
+       } __aligned(SMP_CACHE_BYTES);
 
        struct {
                struct work_struct      index_update_work;
@@ -116,7 +116,7 @@ struct write_point {
                enum write_point_state  state;
                u64                     last_state_change;
                u64                     time[WRITE_POINT_STATE_NR];
-       } __attribute__((__aligned__(SMP_CACHE_BYTES)));
+       } __aligned(SMP_CACHE_BYTES);
 };
 
 struct write_point_specifier {