Changeset 9320

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)
• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• install-windows (modified) (1 prop)
• install-windows/OrangeFS-Client.ism (modified) (1 prop) (previous)
• install-windows/OrangeFS-Client/Script Files/Setup.Rul (modified) (1 diff)
• src/client/sysint/fs-add.sm (modified) (1 diff)
• src/client/windows/client-service (modified) (1 prop)
• src/client/windows/client-service/messages.aps (modified) (1 prop) (previous)

branches/asyncio/ChangeLog

@@ -17 +17 @@
 
 * Bug fix: Fix invalid argument errors on chmod though pvfs2fuse
+
+* Bug fix: uninitialized variable could cause seg fault when file system 
+* cannot be initialized.
 
 orangefs-2.8.4

branches/asyncio/Makefile.in

@@ -342 +342 @@
 SERVERCFLAGS += @OPENSSL_CPPFLAGS@
 
-SERVERLIBS = -lpvfs2-server @LIBS@ @DB_LIB@ @OPENSSL_LIB@ -lpthread 
+SERVERLIBS = -lpvfs2-server @LIBS@ @DB_LIB@ @OPENSSL_LIB@
 
 ifdef NEEDS_LIBRT 
         SERVERLIBS += -lrt
 endif
+
+# must be after -lrt because -lrt may use -lpthread
+SERVERLIBS += -lpthread
 
 # you can optionally disable thread safety support in the client
@@ -1267 +1270 @@
 
 ifdef BUILD_FUSE
-        install -m 755 $(FUSE) $(prefix)/bin
+        install -m 755 $(FUSE) $(bindir)
 endif
 

branches/asyncio/install-windows/OrangeFS-Client/Script Files/Setup.Rul

@@ -453 +453 @@
         szExePath = szProgramFilesDir ^ "\\Dokan\\DokanLibrary\\dokanctl.exe";
     
-        LaunchAppAndWait(szExePath, "/u d", LAAW_OPTION_WAIT);
+        LaunchAppAndWait(szExePath, "/r d", LAAW_OPTION_WAIT);
                                        
         // remove files etc.

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);