-@@ -129,8 +264,8 @@ filesys_self_test (void)
- {
- /* Create file and check that it contains zeros
- throughout the created length. */
-- MUST_SUCCEED (filesys_create ("foo", sizeof s));
-- MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-+ MUST_SUCCEED (filesys_create ("foo", sizeof s, FILE_INODE));
-+ MUST_SUCCEED ((file = file_open (filesys_open ("foo"))) != NULL);
- MUST_SUCCEED (file_read (file, s2, sizeof s2) == sizeof s2);
- MUST_SUCCEED (memcmp (s2, zeros, sizeof s) == 0);
- MUST_SUCCEED (file_tell (file) == sizeof s);
-@@ -138,7 +273,7 @@ filesys_self_test (void)
- file_close (file);
-
- /* Reopen file and write to it. */
-- MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-+ MUST_SUCCEED ((file = file_open (filesys_open ("foo"))) != NULL);
- MUST_SUCCEED (file_write (file, s, sizeof s) == sizeof s);
- MUST_SUCCEED (file_tell (file) == sizeof s);
- MUST_SUCCEED (file_length (file) == sizeof s);
-@@ -146,7 +281,7 @@ filesys_self_test (void)
-
- /* Reopen file and verify that it reads back correctly.
- Delete file while open to check proper semantics. */
-- MUST_SUCCEED ((file = filesys_open ("foo")) != NULL);
-+ MUST_SUCCEED ((file = file_open (filesys_open ("foo"))) != NULL);
- MUST_SUCCEED (filesys_remove ("foo"));
- MUST_SUCCEED (filesys_open ("foo") == NULL);
- MUST_SUCCEED (file_read (file, s2, sizeof s) == sizeof s);
-@@ -173,9 +308,13 @@ static void