projects
/
bluesky.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Quick note on memory leak debugging under valgrind.
[bluesky.git]
/
nfs3
/
nfsd.c
diff --git
a/nfs3/nfsd.c
b/nfs3/nfsd.c
index
f80b01a
..
d323fdb
100644
(file)
--- a/
nfs3/nfsd.c
+++ b/
nfs3/nfsd.c
@@
-19,45
+19,29
@@
#include <netinet/in.h>
#include <glib.h>
#include <netinet/in.h>
#include <glib.h>
-#include "libs3.h"
#include "bluesky.h"
void register_rpc();
BlueSkyFS *fs;
#include "bluesky.h"
void register_rpc();
BlueSkyFS *fs;
-
static uint8_t filesystem_key[16]
;
+
BlueSkyStore *store
;
int main(int argc, char *argv[])
{
int i;
int main(int argc, char *argv[])
{
int i;
- g_thread_init(NULL);
- bluesky_crypt_init();
- register_rpc();
-
- bluesky_crypt_random_bytes(filesystem_key, sizeof(filesystem_key));
- printf("Filesystem key: ");
- for (i = 0; i < sizeof(filesystem_key); i++) {
- printf("%02x", filesystem_key[i]);
- }
- printf("\n");
+ bluesky_init();
+ g_set_prgname("nfsd");
- S3_initialize(NULL, S3_INIT_ALL);
+ const char *target = getenv("BLUESKY_TARGET");
+ if (target == NULL)
+ target = "s3";
-
fs = bluesky_new_fs("export"
);
- fs
->encryption_key = filesystem_key
;
+
store = bluesky_store_new(target
);
+ fs
= bluesky_init_fs("export", store)
;
- BlueSkyInode *root;
- root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
- root->nlink = 1;
- root->mode = 0755;
- bluesky_insert_inode(fs, root);
+ register_rpc();
- 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);
+ bluesky_debug_dump(fs);
svc_run();
fprintf(stderr, "%s", "svc_run returned");
svc_run();
fprintf(stderr, "%s", "svc_run returned");