[Pvfs2-cvs] commit by nlmills in pvfs2/src/client/sysint: sys-create.sm sys-rename.sm sys-setattr.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv27537/src/client/sysint

Modified Files:
      Tag: cu-security-branch
	sys-create.sm sys-rename.sm sys-setattr.sm 
Log Message:
merge with Orange-Branch


Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.115.2.11 -r1.115.2.12
--- sys-create.sm	19 Jun 2010 00:01:35 -0000	1.115.2.11
+++ sys-create.sm	13 Jan 2011 20:11:43 -0000	1.115.2.12
@@ -344,6 +344,13 @@ static PINT_sm_action create_init(
     assert((js_p->error_code == 0) ||
            (js_p->error_code == CREATE_RETRY));
 
+    PINT_SM_GETATTR_STATE_FILL(
+        sm_p->getattr,
+        sm_p->object_ref,
+        PVFS_ATTR_COMMON_ALL|PVFS_ATTR_DIR_HINT|PVFS_ATTR_CAPABILITY, 
+        PVFS_TYPE_DIRECTORY,
+        0);
+
     if (js_p->error_code == CREATE_RETRY)
     {
         js_p->error_code = 0;
@@ -351,14 +358,7 @@ static PINT_sm_action create_init(
         return job_req_sched_post_timer(
             sm_p->msgarray_op.params.retry_delay, smcb, 0, js_p, &tmp_id,
             pint_client_sm_context);
-    }
-
-    PINT_SM_GETATTR_STATE_FILL(
-        sm_p->getattr,
-        sm_p->object_ref,
-        PVFS_ATTR_COMMON_ALL|PVFS_ATTR_DIR_HINT|PVFS_ATTR_CAPABILITY, 
-        PVFS_TYPE_DIRECTORY,
-        0);
+    }    
 
    return SM_ACTION_COMPLETE;
 }

Index: sys-rename.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.56.8.9 -r1.56.8.10
--- sys-rename.sm	19 Jun 2010 00:01:36 -0000	1.56.8.9
+++ sys-rename.sm	13 Jan 2011 20:11:44 -0000	1.56.8.10
@@ -964,11 +964,11 @@ static PINT_sm_action rename_cleanup(
             "ref.handle=%llu ref.fsid=%d\n",
             sm_p->u.rename.entries[1],
             llu(sm_p->u.rename.refns[0].handle),
-            sm_p->u.rename.parent_refns[0].fs_id);
+            sm_p->u.rename.parent_refns[1].fs_id);
 
         PINT_ncache_update((const char*) sm_p->u.rename.entries[1],
             (const PVFS_object_ref*) &(sm_p->u.rename.refns[0]),
-            (const PVFS_object_ref*) &(sm_p->u.rename.parent_refns[0]));
+            (const PVFS_object_ref*) &(sm_p->u.rename.parent_refns[1]));
     }
 
     PINT_SM_GETATTR_STATE_CLEAR(sm_p->getattr);

Index: sys-setattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.51.8.8 -r1.51.8.9
--- sys-setattr.sm	19 Jun 2010 00:01:36 -0000	1.51.8.8
+++ sys-setattr.sm	13 Jan 2011 20:11:44 -0000	1.51.8.9
@@ -112,7 +112,7 @@ PVFS_error PVFS_isys_setattr(
     /* make sure that the permission bits are acceptable */
     if ((attr.mask & PVFS_ATTR_SYS_PERM) && (attr.perms & ~PVFS_PERM_VALID) != 0)
     {
-        gossip_lerr("PVFS_isys_setattr() failure: invalid or unsupported" 
+        gossip_lerr("PVFS_isys_setattr() failure: invalid or unsupported " 
                     "permission bits\n");
         return(-PVFS_EINVAL);
     }