From 32e32bd761e91b9aa21f98b4f4fd4d96c723fdb6 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH] extmod/vfs: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register vfs_cur and
vfs_mount_table instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/vfs.c | 3 +++
 py/mpstate.h | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 8bcead190..2799622b3 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -547,4 +547,7 @@ int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point) {
     return ret;
 }
 
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_cur);
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_mount_table);
+
 #endif // MICROPY_VFS
diff --git a/py/mpstate.h b/py/mpstate.h
index 7ad9d6b29..784eff0a2 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -198,11 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_VFS
-    struct _mp_vfs_mount_t *vfs_cur;
-    struct _mp_vfs_mount_t *vfs_mount_table;
-    #endif
-
     #if MICROPY_PY_BLUETOOTH
     mp_obj_t bluetooth;
     #endif