diff --git a/.bcachefs_revision b/.bcachefs_revision
index d707830c..f8a72b86 100644
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-6c3c2a24c61ddc23a6bbdf604b88262da0cd2d9c
+a6207e71e5deaf4ecb5132e9037ecb49217176d8
diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index 411dc63a..62e937b3 100644
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -889,7 +889,9 @@ struct bch_fs {
 	reflink_gc_table	reflink_gc_table;
 	size_t			reflink_gc_nr;
 
+#ifndef NO_BCACHEFS_FS
 	struct bch_fs_vfs	vfs;
+#endif
 
 	/* QUOTAS */
 	struct bch_memquota_type quotas[QTYP_NR];
diff --git a/libbcachefs/vfs/types.h b/libbcachefs/vfs/types.h
index 2bb38d04..288372a2 100644
--- a/libbcachefs/vfs/types.h
+++ b/libbcachefs/vfs/types.h
@@ -3,7 +3,6 @@
 #define _BCACHEFS_VFS_TYPES_H
 
 struct bch_fs_vfs {
-#ifndef NO_BCACHEFS_FS
 	struct list_head	inodes_list;
 	struct mutex		inodes_lock;
 	struct rhashtable	inodes_table;
@@ -14,7 +13,6 @@ struct bch_fs_vfs {
 	struct bio_set		dio_read_bioset;
 	struct bio_set		nocow_flush_bioset;
 	struct workqueue_struct	*writeback_wq;
-#endif
 };
 
 #endif /* _BCACHEFS_VFS_TYPES_H */