X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=80fb432ab0771e6214da3374daec4bcbd226c65b;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=2a5b789fd0d07c36febe737da19a880253d90887;hpb=c4eb30d2e6e577e424b83d4b5180d48af74e3009;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 2a5b789..80fb432 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -1,3 +1,33 @@
+/* Blue Sky: File Systems in the Cloud
+ *
+ * Copyright (C) 2009  The Regents of the University of California
+ * Written by Michael Vrable <mvrable@cs.ucsd.edu>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 /*
  * This is sample code generated by rpcgen.
  * These are only templates and you can use them
@@ -428,9 +458,15 @@ void nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, inode);
     result.write3res_u.resok.file_wcc = wcc;
     result.write3res_u.resok.count = argp->count;
-    result.write3res_u.resok.committed = FILE_SYNC;
+    result.write3res_u.resok.committed = UNSTABLE;
+    memcpy(result.write3res_u.resok.verf,
+           nfsd_instance_verf_cookie, NFS3_WRITEVERFSIZE);
+
+    if (argp->stable != UNSTABLE) {
+        bluesky_inode_do_sync(inode);
+        result.write3res_u.resok.committed = FILE_SYNC;
+    }
 
-    bluesky_inode_do_sync(inode);
     g_mutex_unlock(inode->lock);
 
     async_rpc_send_reply(req, &result);
@@ -489,6 +525,7 @@ void nfsproc3_create_3_svc(create3args *argp, RPCRequest *req)
     bluesky_directory_insert(dir, argp->where.name, file->inum);
 
     bluesky_inode_update_ctime(dir, TRUE);
+    bluesky_inode_update_ctime(file, FALSE);
 
     wcc.after.present = TRUE;
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
@@ -564,6 +601,7 @@ void nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
     set_attributes(file, &argp->attributes);
 
     bluesky_inode_update_ctime(dir, TRUE);
+    bluesky_inode_update_ctime(file, FALSE);
 
     wcc.after.present = TRUE;
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
@@ -637,6 +675,7 @@ void nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
     bluesky_directory_insert(dir, argp->where.name, file->inum);
 
     bluesky_inode_update_ctime(dir, TRUE);
+    bluesky_inode_update_ctime(file, FALSE);
 
     wcc.after.present = TRUE;
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
@@ -1003,9 +1042,7 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req)
            && 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);
+        bluesky_inode_prefetch(fs, d->inum);
         dircount += 24 + ((strlen(d->name) + 3) & ~3);
         attrcount += 88 + 8 + 8;
         i = g_sequence_iter_next(i);
@@ -1160,6 +1197,8 @@ void nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
 
     result.commit3res_u.resok.file_wcc.after.present = TRUE;
     encode_fattr3(&result.commit3res_u.resok.file_wcc.after.post_op_attr_u.attributes, inode);
+    memcpy(result.commit3res_u.resok.verf,
+           nfsd_instance_verf_cookie, NFS3_WRITEVERFSIZE);
 
     g_mutex_unlock(inode->lock);