Miscellaneous fixes.

[bluesky.git] / nfs3 / nfsd.c

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index 8ba3ef0..323c1b1 100644 (file)
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,7 +19,6 @@
 #include <netinet/in.h>
 #include <glib.h>
 
-#include "libs3.h"
 #include "bluesky.h"
 
 void register_rpc();
@@ -44,17 +43,14 @@ int main(int argc, char *argv[])
     fs->encryption_key = filesystem_key;
 
     BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
-
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
-    file->nlink = 1;
-    file->mode = 0755;
-    bluesky_insert_inode(fs, file);
-    bluesky_directory_insert(root, "demo", file->inum);
+    root = bluesky_get_inode(fs, BLUESKY_ROOT_INUM);
+    if (root == NULL) {
+        printf("Initializing fresh root inode...\n");
+        root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
+        root->nlink = 1;
+        root->mode = 0755;
+        bluesky_insert_inode(fs, root);
+    }
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");