X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=f7e7b4ef96ead8a8cb6fbd772f810841fe1ab6df;hb=4db23448ce252728f10df967b55b2787d5fb8db5;hp=818cd4b8f838a292bac716872393940b0a69b7a5;hpb=105feb97ef2173d6ea45df177599be6d4592640b;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 818cd4b..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,21 @@ 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
+           || g_atomic_int_get(&fs->cache_total) > 8192) {
+        g_print("Too many dirty pages (%d) or total pages (%d); throttling writes...\n",
+                g_atomic_int_get(&fs->cache_dirty),
+                g_atomic_int_get(&fs->cache_total));
+        struct timespec delay;
+        delay.tv_sec = 2;
+        delay.tv_nsec = 0;
+        nanosleep(&delay, NULL);
+    }
+#endif
+
     g_mutex_lock(inode->lock);
 
     encode_pre_wcc(&wcc, inode);
@@ -754,17 +773,22 @@ void nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req)
         async_rpc_send_reply(req, &result);
         return;
     }
-    g_mutex_lock(dir1->lock);
-    encode_pre_wcc(wcc1, dir1);
 
     BlueSkyInode *dir2 = lookup_fh(req, &argp->to.dir);
     if (dir2 == NULL) {
         result.status = NFS3ERR_STALE;
-        g_mutex_unlock(dir1->lock);
         async_rpc_send_reply(req, &result);
         return;
     }
-    g_mutex_lock(dir2->lock);
+
+    if (dir1->inum < dir2->inum) {
+        g_mutex_lock(dir1->lock);
+        g_mutex_lock(dir2->lock);
+    } else if (dir1->inum > dir2->inum) {
+        g_mutex_lock(dir2->lock);
+        g_mutex_lock(dir1->lock);
+    }
+    encode_pre_wcc(wcc1, dir1);
     encode_pre_wcc(wcc2, dir1);
 
     gboolean status = bluesky_rename(dir1, argp->from.name,
@@ -780,8 +804,9 @@ void nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req)
     else
         result.status = NFS3ERR_PERM;
 
-    g_mutex_unlock(dir2->lock);
     g_mutex_unlock(dir1->lock);
+    if (dir1->inum != dir2->inum)
+        g_mutex_unlock(dir2->lock);
     async_rpc_send_reply(req, &result);
 }
 
@@ -971,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
@@ -1097,7 +1122,7 @@ void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
     commit3res result;
     memset(&result, 0, sizeof(result));
 
-    result.status = NFS3ERR_NOTSUPP;
+    result.status = NFS3_OK;
 
     BlueSkyInode *inode = lookup_fh(req, &argp->file);
     if (inode == NULL) {
@@ -1109,7 +1134,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);