Changeset 9320 for branches/asyncio/src/client/sysint/fs-add.sm

Timestamp:

05/23/12 11:57:49 (12 months ago)

Author:

sdsnyde

Message:

fixed conflicts in merge with trunk

Location:

branches/asyncio

Files:

• . (modified) (1 prop)
• src/client/sysint/fs-add.sm (modified) (1 diff)

branches/asyncio/src/client/sysint/fs-add.sm

@@ -218 +218 @@
 {
     int ret = -PVFS_EINVAL, error = 0;
-    PVFS_sys_op_id op_id;
+    PVFS_sys_op_id op_id = -1;
 
     ret = PVFS_isys_fs_add(mntent, &op_id, NULL);