[Pvfs2-cvs] commit by kunkel in pvfs2/src/server: lookup.sm

CVS commit program cvs at parl.clemson.edu
Sat Feb 17 05:39:38 EST 2007


Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv589/src/server

Modified Files:
      Tag: kunkel-hint-branch
	lookup.sm 
Log Message:
Sync hint-branch to current CVS version


Index: lookup.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/lookup.sm,v
diff -p -u -r1.48.2.2 -r1.48.2.3
--- lookup.sm	25 Sep 2006 15:28:38 -0000	1.48.2.2
+++ lookup.sm	17 Feb 2007 10:39:38 -0000	1.48.2.3
@@ -461,16 +461,23 @@ static int lookup_check_acls(
        find the segment that we should look up in the directory */
     if (js_p->error_code == 0)
     {
-        int ret = PINT_string_next_segment(
+        js_p->error_code = PINT_string_next_segment(
             s_op->req->u.lookup_path.path, &s_op->u.lookup.segp,
             &s_op->u.lookup.segstate);
 
-        assert(ret == 0);
-
-        gossip_debug(GOSSIP_SERVER_DEBUG, "  after ACL check "
-                    "object is a directory; will be "
-                     "looking for handle for segment \"%s\" in a bit\n",
-                     s_op->u.lookup.segp);
+        if(js_p->error_code != 0)
+        {
+            gossip_err("PINT_string_next_segment failed to get the"
+                       "next segment to lookup from the path: %s\n",
+                       s_op->req->u.lookup_path.path);
+        }
+        else
+        {
+            gossip_debug(GOSSIP_SERVER_DEBUG, "  after ACL check "
+                         "object is a directory; will be "
+                         "looking for handle for segment \"%s\" in a bit\n",
+                         s_op->u.lookup.segp);
+        }
     }
 cleanup:
     if (s_op->val.buffer) 



More information about the Pvfs2-cvs mailing list