Changeset 1390 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 9, 2007 8:52:00 PM (18 years ago)

Author:

vboxsync

Message:

A Quick hack to support single locks on samba shares. (TODO: needs per file handle data for tracking multiple locks if we ever will be needing multiple locks per file.)

File:

• trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp

@@ -29 +29 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/fcntl.hs>
+#include <sys/fcntl.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -80 +80 @@
     if (fcntl(File, (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
+    int iErr = errno;
+    if (iErr == ENOTSUP)
+    {
+        /*
+         * This is really bad hack for getting VDIs to work somewhat
+         * safely on SMB mounts.
+         */
+        /** @todo we need to keep track of these locks really. Anyone requiring to lock more
+         * than one part of a file will have to fix this. */
+        unsigned f = 0;
+        Assert(RTFILE_LOCK_WAIT);
+        if (fLock & RTFILE_LOCK_WAIT)
+            f |= LOCK_NB;
+        if (fLock & RTFILE_LOCK_WRITE)
+            f |= LOCK_EX;
+        else
+            f |= LOCK_SH;
+        if (!flock(File, f))
+            return VINF_SUCCESS;
+        iErr = errno;
+        if (iErr == EWOULDBLOCK)
+            return VERR_FILE_LOCK_VIOLATION;
+    }
 
-    int iErr = errno;
     if (    iErr == EAGAIN
         ||  iErr == EACCES)
@@ -124 +146 @@
         return VINF_SUCCESS;
 
-    /* @todo check error codes for non existing lock. */
     int iErr = errno;
+    if (iErr == ENOTSUP)
+    {
+        /* A SMB hack, see RTFileLock. */
+        if (!flock(File, LOCK_UN))
+            return VINF_SUCCESS;
+    }
+
+    /** @todo check error codes for non existing lock. */
     if (    iErr == EAGAIN
         ||  iErr == EACCES)
@@ -133 +162 @@
 }
 
-