X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=818cd4b8f838a292bac716872393940b0a69b7a5;hb=4540b5b4a664faa0cdac04b61a2e336dc5cadf94;hp=72ec9cb7a26173e6a0732a428a901d0c0af99597;hpb=50c08ba526a6638e8e3c4eec0503365a2c110a85;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 72ec9cb..818cd4b 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -9,6 +9,9 @@
 
 extern BlueSkyFS *fs;
 
+#define NFS_BLOCKSIZE 32768
+#define NFS_MAXSIZE (1 << 20)
+
 /* Check that a string is a valid file name.  We require that it be valid
  * UTF-8, that it not be empty, and that it not contain embedded forward
  * slashes.  Also checks that the length of the string is not more than the
@@ -243,10 +246,14 @@ void nfsproc3_lookup_3_svc(diropargs3 *argp, RPCRequest *req)
         async_rpc_send_reply(req, &result);
         return;
     }
+
+    result.lookup3res_u.resok.dir_attributes.present = TRUE;
+    encode_fattr3(&result.lookup3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+    g_mutex_unlock(dir->lock);
+
     BlueSkyInode *inode = bluesky_get_inode(fs, inum);
     if (inode == NULL) {
         result.status = NFS3ERR_NOENT;
-        g_mutex_unlock(dir->lock);
         async_rpc_send_reply(req, &result);
         return;
     }
@@ -254,8 +261,6 @@ void nfsproc3_lookup_3_svc(diropargs3 *argp, RPCRequest *req)
     schedule_inode_unref(req, inode);
 
     result.status = NFS3_OK;
-    result.lookup3res_u.resok.dir_attributes.present = TRUE;
-    encode_fattr3(&result.lookup3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
     result.lookup3res_u.resok.obj_attributes.present = TRUE;
     encode_fattr3(&result.lookup3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
 
@@ -265,7 +270,6 @@ void nfsproc3_lookup_3_svc(diropargs3 *argp, RPCRequest *req)
     result.lookup3res_u.resok.object.data.data_val = (char *)&fh_bytes;
 
     g_mutex_unlock(inode->lock);
-    g_mutex_unlock(dir->lock);
     async_rpc_send_reply(req, &result);
 }
 
@@ -322,7 +326,7 @@ void nfsproc3_read_3_svc(read3args *argp, RPCRequest *req)
 {
     read3res result;
     memset(&result, 0, sizeof(result));
-    char buf[32768];
+    char buf[NFS_MAXSIZE];
 
     BlueSkyInode *inode = lookup_fh(req, &argp->file);
     if (inode == NULL) {
@@ -339,6 +343,7 @@ void nfsproc3_read_3_svc(read3args *argp, RPCRequest *req)
         count = 0;
         result.read3res_u.resok.eof = TRUE;
     } else {
+        count = MIN(count, NFS_MAXSIZE);
         count = MIN(count, inode->size - argp->offset);
         if (argp->offset + count == inode->size)
             result.read3res_u.resok.eof = TRUE;
@@ -937,12 +942,32 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req)
     uint64_t fh_bytes[MAX_READDIR_DIRENTS];
     int count = 0;
 
-    /* TODO: Handle dircount, maxcount arguments from client. */
-
+    GSequenceIter *i;
     BlueSkyDirent start = {NULL, NULL, argp->cookie, 0};
-    GSequenceIter *i = g_sequence_search(dir->dirents, &start,
-                                         bluesky_dirent_compare, NULL);
 
+    /* Perform a prefetch pass on inodes: for all the inodes we think we will
+     * return information about, try to load each one but don't wait.  This
+     * should let multiple inodes be fetched in parallel, instead of
+     * sequentially in the loop that follows. */
+    i = g_sequence_search(dir->dirents, &start, bluesky_dirent_compare, NULL);
+    while (count < MAX_READDIR_DIRENTS
+           && !g_sequence_iter_is_end(i)
+           && dircount <= argp->dircount
+           && dircount + attrcount <= argp->maxcount)
+    {
+        BlueSkyDirent *d = g_sequence_get(i);
+        BlueSkyInode *inode = bluesky_get_inode(fs, d->inum);
+        if (inode != NULL)
+            bluesky_inode_unref(inode);
+        dircount += 24 + ((strlen(d->name) + 3) & ~3);
+        attrcount += 88 + 8 + 8;
+        i = g_sequence_iter_next(i);
+    }
+
+    i = g_sequence_search(dir->dirents, &start, bluesky_dirent_compare, NULL);
+    count = 0;
+    dircount = 88 + 16;
+    attrcount = 0;
     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);
@@ -1027,13 +1052,13 @@ void nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, RPCRequest *req)
     result.status = NFS3_OK;
     result.fsinfo3res_u.resok.obj_attributes.present = TRUE;
     encode_fattr3(&result.fsinfo3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
-    result.fsinfo3res_u.resok.rtmax = 32768;
-    result.fsinfo3res_u.resok.rtpref = 32768;
-    result.fsinfo3res_u.resok.rtmult = 4096;
-    result.fsinfo3res_u.resok.wtmax = 32768;
-    result.fsinfo3res_u.resok.wtpref = 32768;
-    result.fsinfo3res_u.resok.wtmult = 4096;
-    result.fsinfo3res_u.resok.dtpref = 4096;
+    result.fsinfo3res_u.resok.rtmax = NFS_MAXSIZE;
+    result.fsinfo3res_u.resok.rtpref = NFS_MAXSIZE;
+    result.fsinfo3res_u.resok.rtmult = NFS_BLOCKSIZE;
+    result.fsinfo3res_u.resok.wtmax = NFS_MAXSIZE;
+    result.fsinfo3res_u.resok.wtpref = NFS_MAXSIZE;
+    result.fsinfo3res_u.resok.wtmult = NFS_BLOCKSIZE;
+    result.fsinfo3res_u.resok.dtpref = NFS_BLOCKSIZE;
     result.fsinfo3res_u.resok.maxfilesize = 0x7fffffffffffffffULL;
     result.fsinfo3res_u.resok.time_delta.seconds = 0;
     result.fsinfo3res_u.resok.time_delta.nseconds = 1000;
@@ -1074,5 +1099,22 @@ void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
 
     result.status = NFS3ERR_NOTSUPP;
 
+    BlueSkyInode *inode = lookup_fh(req, &argp->file);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        async_rpc_send_reply(req, &result);
+        return;
+    }
+
+    g_mutex_lock(inode->lock);
+    encode_pre_wcc(&result.commit3res_u.resok.file_wcc, 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);
+
+    g_mutex_unlock(inode->lock);
+
     async_rpc_send_reply(req, &result);
 }