X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=a0102efbf899633e4c0579bc7f1d6d0e7eec5a94;hb=04778bf2a2063b7be540b5be45c7451d00af1b81;hp=c5e444807f66952837811ffd5406c87ba2e41ba4;hpb=1edfd0c0070b18a6837385a9fd11ba759202495e;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index c5e4448..a0102ef 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -328,6 +328,8 @@ void nfsproc3_read_3_svc(read3args *argp, RPCRequest *req)
     memset(&result, 0, sizeof(result));
     char buf[NFS_MAXSIZE];
 
+    bluesky_flushd_invoke_conditional(fs);
+
     BlueSkyInode *inode = lookup_fh(req, &argp->file);
     if (inode == NULL) {
         result.status = NFS3ERR_STALE;
@@ -372,6 +374,8 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
     struct wcc_data wcc;
     memset(&wcc, 0, sizeof(wcc));
 
+    bluesky_flushd_invoke_conditional(fs);
+
     BlueSkyInode *inode = lookup_fh(req, &argp->file);
     if (inode == NULL) {
         result.status = NFS3ERR_STALE;
@@ -380,6 +384,7 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
         return;
     }
 
+#if 0
     /* FIXME: Hack to throttle writes when there is too much dirty data still
      * to be written out. */
     while (g_atomic_int_get(&fs->cache_dirty) > 4096
@@ -392,6 +397,7 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
         delay.tv_nsec = 0;
         nanosleep(&delay, NULL);
     }
+#endif
 
     g_mutex_lock(inode->lock);
 
@@ -464,18 +470,19 @@ void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req)
         return;
     }
 
+    g_mutex_lock(fs->lock);
     BlueSkyInode *file;
     file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
     file->nlink = 1;
     file->mode = 0755;
     int64_t time = bluesky_get_current_time();
-    printf("time: %"PRIi64"\n", time);
     file->mtime = time;
     file->ctime = time;
     file->atime = time;
     file->ntime = time;
     g_mutex_lock(file->lock);
     bluesky_insert_inode(fs, file);
+    g_mutex_unlock(fs->lock);
     bluesky_directory_insert(dir, argp->where.name, file->inum);
 
     bluesky_inode_update_ctime(dir, TRUE);
@@ -535,6 +542,7 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
         return;
     }
 
+    g_mutex_lock(fs->lock);
     BlueSkyInode *file;
     file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_DIRECTORY);
     file->nlink = 1;
@@ -546,6 +554,7 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
     file->ntime = time;
     g_mutex_lock(file->lock);
     bluesky_insert_inode(fs, file);
+    g_mutex_unlock(fs->lock);
     bluesky_directory_insert(dir, argp->where.name, file->inum);
     set_attributes(file, &argp->attributes);
 
@@ -604,6 +613,7 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
         return;
     }
 
+    g_mutex_lock(fs->lock);
     BlueSkyInode *file;
     file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_SYMLINK);
     file->nlink = 1;
@@ -616,6 +626,7 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
     file->symlink_contents = g_strdup(argp->symlink.symlink_data);
     g_mutex_lock(file->lock);
     bluesky_insert_inode(fs, file);
+    g_mutex_unlock(fs->lock);
     bluesky_directory_insert(dir, argp->where.name, file->inum);
 
     bluesky_inode_update_ctime(dir, TRUE);
@@ -990,8 +1001,8 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req)
     while (count < MAX_READDIR_DIRENTS && !g_sequence_iter_is_end(i)) {
         BlueSkyDirent *d = g_sequence_get(i);
         BlueSkyInode *inode = bluesky_get_inode(fs, d->inum);
-        g_mutex_lock(inode->lock);
         if (inode != NULL) {
+            g_mutex_lock(inode->lock);
             dircount += 24 + ((strlen(d->name) + 3) & ~3);
             attrcount += 88 + 8 + 8;
             if (dircount > argp->dircount
@@ -1128,7 +1139,7 @@ void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
     g_mutex_lock(inode->lock);
     encode_pre_wcc(&result.commit3res_u.resok.file_wcc, inode);
 
-    bluesky_inode_do_sync(inode);
+    //bluesky_inode_do_sync(inode);
 
     result.commit3res_u.resok.file_wcc.after.present = TRUE;
     encode_fattr3(&result.commit3res_u.resok.file_wcc.after.post_op_attr_u.attributes, inode);