X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=70273ffd322e50de14e93856bf822785db09fed0;hb=53162a864578bcfbc2c35cbc59b9395d7108a2fe;hp=70c9a606f09d31e581626c09aac3f3132123b940;hpb=1fddb0453f35dd19cb96d2ef14784f0e31e63564;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 70c9a60..70273ff 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,7 +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 4
+#define MAX_READDIR_DIRENTS 64
 readdir3res *
 nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 {
@@ -724,6 +797,13 @@ 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;
 
     BlueSkyInode *dir = lookup_fh(&argp->dir);
@@ -753,6 +833,11 @@ nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp)
         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;