Update bcachefs sources to 171da96d76 bcachefs: Drop some anonymous structs, unions

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

diff --git a/libbcachefs/super.h b/libbcachefs/super.h
index 8501adaff4c2f3286e1f42755732de93366e5817..d4e939c808faf5adb95a4edf24da4b271880b0d2 100644 (file)
--- a/libbcachefs/super.h
+++ b/libbcachefs/super.h
@@ -88,9 +88,10 @@ static inline void bch2_dev_list_drop_dev(struct bch_devs_list *devs,
 static inline void bch2_dev_list_add_dev(struct bch_devs_list *devs,
                                         unsigned dev)
 {
-       BUG_ON(bch2_dev_list_has_dev(*devs, dev));
-       BUG_ON(devs->nr >= ARRAY_SIZE(devs->devs));
-       devs->devs[devs->nr++] = dev;
+       if (!bch2_dev_list_has_dev(*devs, dev)) {
+               BUG_ON(devs->nr >= ARRAY_SIZE(devs->devs));
+               devs->devs[devs->nr++] = dev;
+       }
 }
 
 static inline struct bch_devs_list bch2_dev_list_single(unsigned dev)
@@ -250,7 +251,8 @@ int bch2_fs_read_write_early(struct bch_fs *);
  */
 static inline void bch2_fs_lazy_rw(struct bch_fs *c)
 {
-       if (percpu_ref_is_zero(&c->writes))
+       if (!test_bit(BCH_FS_RW, &c->flags) &&
+           !test_bit(BCH_FS_WAS_RW, &c->flags))
                bch2_fs_read_write_early(c);
 }