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

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 8f15857..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
@@ -1018,24 +1048,6 @@ void nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req)
         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)
-           && 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;