X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=a5439f8c5894c6dfa5d5e03f0812b4c043678e10;hb=14a09b1c9822ee4a86a009eee212da8fdc325d3f;hp=90f62d7108a1ad25dc8e66ef1b5c4393ecc9d60f;hpb=f48181d57295355b68dffdd8fad5729bf952ba7a;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 90f62d7..a5439f8 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -42,6 +42,13 @@ BlueSkyInode *lookup_fh(nfs_fh3 *fh)
     return inode;
 }
 
+int64_t decode_nfstime3(nfstime3 *time)
+{
+    int64_t result = (int64_t)time->seconds * 1000000;
+    result += time->nseconds / 1000;
+    return result;
+}
+
 /* Copy inode attributes into NFS response.  The BlueSkyInode should be locked
  * by the caller. */
 void encode_fattr3(struct fattr3 *result, BlueSkyInode *inode)
@@ -101,7 +108,73 @@ nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp)
 {
     static wccstat3 result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    result.wccstat3_u.wcc.before.present = FALSE;
+    result.wccstat3_u.wcc.after.present = FALSE;
+    BlueSkyInode *inode = lookup_fh(&argp->object);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+
+    encode_pre_wcc(&result.wccstat3_u.wcc, inode);
+    if (argp->guard.check) {
+        if (inode->ctime != decode_nfstime3(&argp->guard.sattrguard3_u.ctime)) {
+            result.status = NFS3ERR_NOT_SYNC;
+            result.wccstat3_u.wcc.after.present = TRUE;
+            encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes, inode);
+            return &result;
+        }
+    }
+
+    if (argp->new_attributes.mode.set) {
+        inode->mode = argp->new_attributes.mode.set_uint32_u.val;
+    }
+
+    if (argp->new_attributes.uid.set) {
+        inode->uid = argp->new_attributes.uid.set_uint32_u.val;
+    }
+
+    if (argp->new_attributes.gid.set) {
+        inode->gid = argp->new_attributes.gid.set_uint32_u.val;
+    }
+
+    int64_t now = bluesky_get_current_time();
+
+    if (argp->new_attributes.size.set) {
+        bluesky_file_truncate(inode,
+                              argp->new_attributes.size.set_uint64_u.val);
+        inode->mtime = now;
+    }
+
+    switch (argp->new_attributes.atime.set) {
+    case DONT_CHANGE:
+        break;
+    case SET_TO_SERVER_TIME:
+        inode->atime = now;
+        break;
+    case SET_TO_CLIENT_TIME:
+        inode->atime = decode_nfstime3(&argp->new_attributes.atime.set_time_u.time);
+        break;
+    }
+
+    switch (argp->new_attributes.mtime.set) {
+    case DONT_CHANGE:
+        break;
+    case SET_TO_SERVER_TIME:
+        inode->mtime = now;
+        break;
+    case SET_TO_CLIENT_TIME:
+        inode->mtime = decode_nfstime3(&argp->new_attributes.mtime.set_time_u.time);
+        break;
+    }
+
+    inode->ctime = now;
+    inode->change_count++;
+
+    result.wccstat3_u.wcc.after.present = TRUE;
+    encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
+                  inode);
+    result.status = NFS3_OK;
 
     return &result;
 }
@@ -188,8 +261,35 @@ read3res *
 nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp)
 {
     static read3res result;
+    static char buf[32768];
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(&argp->file);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.read3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    int count = argp->count;
+    if (argp->offset >= inode->size) {
+        count = 0;
+        result.read3res_u.resok.eof = TRUE;
+    } else {
+        count = MIN(count, inode->size - argp->offset);
+        if (argp->offset + count == inode->size)
+            result.read3res_u.resok.eof = TRUE;
+        else
+            result.read3res_u.resok.eof = FALSE;
+
+        bluesky_file_read(inode, argp->offset, buf, count);
+    }
+
+    result.status = NFS3_OK;
+    result.read3res_u.resok.file_attributes.present = TRUE;
+    encode_fattr3(&result.read3res_u.resok.file_attributes.post_op_attr_u.attributes, inode);
+    result.read3res_u.resok.count = count;
+    result.read3res_u.resok.data.data_val = buf;
+    result.read3res_u.resok.data.data_len = count;
 
     return &result;
 }
@@ -219,7 +319,13 @@ nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp)
     if (lastbyte > inode->size) {
         bluesky_file_truncate(inode, lastbyte);
     }
-    inode->change_count++;
+
+    if (argp->data.data_len < argp->count) {
+        /* ??? */
+    } else {
+        bluesky_file_write(inode, argp->offset,
+                           argp->data.data_val, argp->count);
+    }
 
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, inode);
     result.write3res_u.resok.file_wcc = wcc;
@@ -260,7 +366,7 @@ nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp)
     }
 
     BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), BLUESKY_REGULAR);
+    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();
@@ -389,7 +495,7 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
         BlueSkyDirent *d = g_sequence_get(i);
         dirents[count].fileid = d->inum;
         dirents[count].name = d->name;
-        dirents[count].cookie = d->hash;
+        dirents[count].cookie = d->cookie;
         dirents[count].nextentry = NULL;
         if (count > 0)
             dirents[count - 1].nextentry = &dirents[count];