RPC header file cleanup.

[bluesky.git] / nfs3 / nfsd.c

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index f33a945..16011f4 100644 (file)
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,34 +19,33 @@
 #include <netinet/in.h>
 #include <glib.h>
 
-#include "libs3.h"
 #include "bluesky.h"
 
 void register_rpc();
 
 BlueSkyFS *fs;
+BlueSkyStore *store;
 
 int main(int argc, char *argv[])
 {
-    g_thread_init(NULL);
+    int i;
+    bluesky_init();
     register_rpc();
 
-    S3_initialize(NULL, S3_INIT_ALL);
+    bluesky_options.synchronous_stores = 1;
 
-    fs = bluesky_new_fs("export");
+    store = bluesky_store_new("file");
+    fs = bluesky_init_fs("export", store);
 
     BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
-
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(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");