X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=9fccd00f2fe31b55121111555b1cf9cc784800a3;hb=cb5c460ba6a31c27ac0d6803c33e9e6c5a140acd;hp=c668542fb3aa1435f2482af698b45d61bf1d9d5b;hpb=8f8e45baddcf19780e4189539771299bb0ace10b;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index c668542..9fccd00 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -600,7 +600,51 @@ nfsproc3_rmdir_3_svc(diropargs3 *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 *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+
+    encode_pre_wcc(&result.wccstat3_u.wcc, dir);
+
+    if (!validate_filename(argp->name)
+        || strcmp(argp->name, ".") == 0
+        || strcmp(argp->name, "..") == 0)
+    {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    uint64_t inum = bluesky_directory_lookup(dir, argp->name);
+    BlueSkyInode *inode = bluesky_get_inode(fs, inum);
+    if (inode == NULL) {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    if (inode->type != BLUESKY_DIRECTORY) {
+        result.status = NFS3ERR_NOTDIR;
+        return &result;
+    }
+    if (g_sequence_get_length(inode->dirents) > 0) {
+        printf("Directory not empty: %d entries\n",
+               g_sequence_get_length(inode->dirents));
+        result.status = NFS3ERR_NOTEMPTY;
+        return &result;
+    }
+
+    /* TODO: Decrement link count, deallocate inode if needed. */
+
+    bluesky_directory_remove(dir, argp->name);
+
+    result.status = NFS3_OK;
+    result.wccstat3_u.wcc.after.present = TRUE;
+    encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
+                  dir);
 
     return &result;
 }
@@ -609,8 +653,37 @@ rename3res *
 nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp)
 {
     static rename3res result;
+    wcc_data *wcc1 = &result.rename3res_u.res.fromdir_wcc;
+    wcc_data *wcc2 = &result.rename3res_u.res.todir_wcc;
+    memset(wcc1, 0, sizeof(*wcc1));
+    memset(wcc2, 0, sizeof(*wcc2));
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir1 = lookup_fh(&argp->from.dir);
+    if (dir1 == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+    encode_pre_wcc(wcc1, dir1);
+
+    BlueSkyInode *dir2 = lookup_fh(&argp->to.dir);
+    if (dir2 == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+    encode_pre_wcc(wcc2, dir1);
+
+    gboolean status = bluesky_rename(dir1, argp->from.name,
+                                     dir2, argp->to.name,
+                                     TRUE, TRUE);
+
+    wcc1->after.present = TRUE;
+    encode_fattr3(&wcc1->after.post_op_attr_u.attributes, dir1);
+    wcc2->after.present = TRUE;
+    encode_fattr3(&wcc2->after.post_op_attr_u.attributes, dir2);
+    if (status)
+        result.status = NFS3_OK;
+    else
+        result.status = NFS3ERR_PERM;
 
     return &result;
 }
@@ -674,6 +747,7 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
 gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
                             gpointer unused);
 
+#define MAX_READDIR_DIRENTS 64
 readdir3res *
 nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 {
@@ -692,7 +766,6 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
     memset(result.readdir3res_u.resok.cookieverf, 0,
            sizeof(result.readdir3res_u.resok.cookieverf));
 
-#define MAX_READDIR_DIRENTS 4
     static entry3 dirents[MAX_READDIR_DIRENTS];
     int count = 0;
 
@@ -724,9 +797,70 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 readdirplus3res *
 nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp)
 {
+    /* XDR-encoded sizes:
+     *   post_op_attr: 88 bytes
+     *   base readdirplus3resok: 88 + 16 bytes
+     *   base directory entry: 24 bytes + filename
+     *   attributes/fh3: 88 + 8 + filehandle size
+     */
+    size_t dircount = 88 + 16, attrcount = 0;
     static readdirplus3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.readdirplus3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.readdirplus3res_u.resok.dir_attributes.present = TRUE;
+    encode_fattr3(&result.readdirplus3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+    memset(result.readdirplus3res_u.resok.cookieverf, 0,
+           sizeof(result.readdirplus3res_u.resok.cookieverf));
+
+    static entryplus3 dirents[MAX_READDIR_DIRENTS];
+    static uint64_t fh_bytes[MAX_READDIR_DIRENTS];
+    int count = 0;
+
+    /* TODO: Handle dircount, maxcount arguments from client. */
+
+    BlueSkyDirent start = {NULL, NULL, argp->cookie, 0};
+    GSequenceIter *i = g_sequence_search(dir->dirents, &start,
+                                         bluesky_dirent_compare, NULL);
+
+    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);
+        if (inode != NULL) {
+            dircount += 24 + ((strlen(d->name) + 3) & ~3);
+            attrcount += 88 + 8 + 8;
+            if (dircount > argp->dircount
+                || dircount + attrcount > argp->maxcount)
+                break;
+            dirents[count].fileid = d->inum;
+            dirents[count].name = d->name;
+            dirents[count].cookie = d->cookie;
+            dirents[count].nextentry = NULL;
+            dirents[count].name_attributes.present = TRUE;
+            encode_fattr3(&dirents[count].name_attributes.post_op_attr_u.attributes, inode);
+            fh_bytes[count] = GUINT64_TO_BE(d->inum);
+            dirents[count].name_handle.present = TRUE;
+            dirents[count].name_handle.post_op_fh3_u.handle.data.data_len = 8;
+            dirents[count].name_handle.post_op_fh3_u.handle.data.data_val
+                = (char *)&fh_bytes[count];
+            if (count > 0)
+                dirents[count - 1].nextentry = &dirents[count];
+            count++;
+        }
+        i = g_sequence_iter_next(i);
+    }
+
+    if (count > 0)
+        result.readdirplus3res_u.resok.reply.entries = &dirents[0];
+    else
+        result.readdirplus3res_u.resok.reply.entries = NULL;
+    result.readdirplus3res_u.resok.reply.eof = g_sequence_iter_is_end(i);
 
     return &result;
 }
@@ -736,7 +870,24 @@ nfsproc3_fsstat_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 {
     static fsstat3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(argp);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.fsstat3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.fsstat3res_u.resok.obj_attributes.present = TRUE;
+    encode_fattr3(&result.fsstat3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
+
+    result.fsstat3res_u.resok.tbytes = (1 << 30);
+    result.fsstat3res_u.resok.fbytes = (1 << 30);
+    result.fsstat3res_u.resok.abytes = (1 << 30);
+    result.fsstat3res_u.resok.tfiles = 0;
+    result.fsstat3res_u.resok.ffiles = 0;
+    result.fsstat3res_u.resok.afiles = 0;
+    result.fsstat3res_u.resok.invarsec = 0;
 
     return &result;
 }