X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;ds=sidebyside;f=nfs3%2Fnfs3.c;h=f7e7b4ef96ead8a8cb6fbd772f810841fe1ab6df;hb=d3c7929485ee2a0637e8fce739bad597ce11253d;hp=b4791070606e73647b514bf12aa7255ace1aa99e;hpb=cf3d405919942d3adf810bba0ed5df28a91b6d2d;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index b479107..f7e7b4e 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);
 
@@ -990,8 +996,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