Changeset 46237 in vbox

Timestamp:

May 23, 2013 2:39:41 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85966

Message:

solaris/SharedFolders: Fix bug with truncating existing files on open. Avoids re-opening files during such a case for every read/write operation. Also avoid extra call through HGCM for each read-only file open operation.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_prov.c (modified) (7 diffs)
• vboxfs_prov.h (modified) (3 diffs)
• vboxfs_vnode.c (modified) (10 diffs)
• vboxfs_vnode.h (modified) (1 diff)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -41 +41 @@
 #include <sys/sunddi.h>
 #include <sys/dirent.h>
+#include <sys/file.h>
 #include "vboxfs_prov.h"
 #ifdef u
@@ -357 +358 @@
 
 int
-sfprov_open(sfp_mount_t *mnt, char *path, sfp_file_t **fp)
+sfprov_diropen(sfp_mount_t *mnt, char *path, sfp_file_t **fp)
 {
         int rc;
@@ -365 +366 @@
         sfp_file_t *newfp;
 
-        /*
-         * First we attempt to open it read/write. If that fails we
-         * try read only.
-         */
         bzero(&parms, sizeof(parms));
         str = sfprov_string(path, &size);
         parms.Handle = SHFL_HANDLE_NIL;
         parms.Info.cbObject = 0;
-        parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE;
+        parms.CreateFlags =   SHFL_CF_DIRECTORY
+                                                | SHFL_CF_ACCESS_READ
+                                                | SHFL_CF_ACT_OPEN_IF_EXISTS
+                                                | SHFL_CF_ACT_FAIL_IF_NEW;
+
+        /*
+         * Open the host directory.
+         */
         rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
-        if (RT_FAILURE(rc) && rc != VERR_ACCESS_DENIED) {
+
+        /*
+         * Our VBoxFS interface here isn't very clear regarding failure and informational status.
+         * Check the file-handle as well as the return code to make sure the operation succeeded.
+         */
+        if (RT_FAILURE(rc)) {
                 kmem_free(str, size);
                 return (sfprov_vbox2errno(rc));
         }
+
         if (parms.Handle == SHFL_HANDLE_NIL) {
-                if (parms.Result == SHFL_PATH_NOT_FOUND ||
-                    parms.Result == SHFL_FILE_NOT_FOUND) {
-                        kmem_free(str, size);
-                        return (ENOENT);
-                }
-                parms.CreateFlags =
-                    SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READ;
-                rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
-                if (RT_FAILURE(rc)) {
-                        kmem_free(str, size);
-                        return (sfprov_vbox2errno(rc));
-                }
-                if (parms.Handle == SHFL_HANDLE_NIL) {
-                        kmem_free(str, size);
-                        return (ENOENT);
-                }
-        }
-        else
                 kmem_free(str, size);
+                return (ENOENT);
+        }
+
         newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP);
         newfp->handle = parms.Handle;
@@ -407 +402 @@
 
 int
-sfprov_trunc(sfp_mount_t *mnt, char *path)
+sfprov_open(sfp_mount_t *mnt, char *path, sfp_file_t **fp, int flag)
 {
         int rc;
@@ -413 +408 @@
         SHFLSTRING *str;
         int size;
+        sfp_file_t *newfp;
+
+        bzero(&parms, sizeof(parms));
+        str = sfprov_string(path, &size);
+        parms.Handle = SHFL_HANDLE_NIL;
+        parms.Info.cbObject = 0;
 
         /*
-         * open it read/write.
+         * Translate file modes.
          */
-        str = sfprov_string(path, &size);
-        parms.Handle = 0;
-        parms.Info.cbObject = 0;
-        parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE |
-            SHFL_CF_ACT_OVERWRITE_IF_EXISTS;
+        if (flag & FCREAT) {
+                parms.CreateFlags |= SHFL_CF_ACT_CREATE_IF_NEW;
+                if (!(flag & FTRUNC))
+                        parms.CreateFlags |= SHFL_CF_ACT_OPEN_IF_EXISTS;
+        }
+        else
+                parms.CreateFlags |= SHFL_CF_ACT_FAIL_IF_NEW;
+
+        if (flag & FTRUNC)
+                parms.CreateFlags |= SHFL_CF_ACT_OVERWRITE_IF_EXISTS | SHFL_CF_ACCESS_WRITE;
+        if (flag & FWRITE)
+                parms.CreateFlags |= SHFL_CF_ACCESS_WRITE;
+        if (flag & FREAD)
+                parms.CreateFlags |= SHFL_CF_ACCESS_READ;
+    if (flag & FAPPEND)
+                parms.CreateFlags |= SHFL_CF_ACCESS_APPEND;
+
+        /*
+         * Open/create the host file.
+         */
         rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
-        kmem_free(str, size);
-
+
+        /*
+         * Our VBoxFS interface here isn't very clear regarding failure and informational status.
+         * Check the file-handle as well as the return code to make sure the operation succeeded.
+         */
         if (RT_FAILURE(rc)) {
-                return (EINVAL);
-        }
-        (void)vboxCallClose(&vbox_client, &mnt->map, parms.Handle);
+                kmem_free(str, size);
+                return (sfprov_vbox2errno(rc));
+        }
+
+        if (parms.Handle == SHFL_HANDLE_NIL) {
+                kmem_free(str, size);
+                return (ENOENT);
+        }
+
+        newfp = kmem_alloc(sizeof(sfp_file_t), KM_SLEEP);
+        newfp->handle = parms.Handle;
+        newfp->map = mnt->map;
+        *fp = newfp;
         return (0);
 }
@@ -890 +919 @@
         sfp_mount_t *mnt,
         char *path,
-        sffs_dirents_t **dirents)
+        sffs_dirents_t **dirents,
+        int flag)
 {
         int error;
@@ -911 +941 @@
         *dirents = NULL;
 
-        error = sfprov_open(mnt, path, &fp);
+        error = sfprov_diropen(mnt, path, &fp);
         if (error != 0)
                 return (ENOENT);

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h

@@ -101 +101 @@
 extern int sfprov_create(sfp_mount_t *, char *path, mode_t mode,
     sfp_file_t **fp, sffs_stat_t *stat);
-extern int sfprov_open(sfp_mount_t *, char *path, sfp_file_t **fp);
+extern int sfprov_diropen(sfp_mount_t *mnt, char *path, sfp_file_t **fp);
+extern int sfprov_open(sfp_mount_t *, char *path, sfp_file_t **fp, int flag);
 extern int sfprov_close(sfp_file_t *fp);
 extern int sfprov_read(sfp_file_t *, char * buffer, uint64_t offset,
@@ -127 +128 @@
  * File/Directory operations
  */
-extern int sfprov_trunc(sfp_mount_t *, char *);
 extern int sfprov_remove(sfp_mount_t *, char *path, uint_t is_link);
 extern int sfprov_mkdir(sfp_mount_t *, char *path, mode_t mode,
@@ -165 +165 @@
 
 extern int sfprov_readdir(sfp_mount_t *mnt, char *path,
-        sffs_dirents_t **dirents);
+        sffs_dirents_t **dirents, int flag);
 
 #ifdef  __cplusplus

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c

@@ -186 +186 @@
  */
 static void
-sfnode_open(sfnode_t *node)
+sfnode_open(sfnode_t *node, int flag)
 {
         int error;
@@ -193 +193 @@
         if (node->sf_file != NULL)
                 return;
-        error = sfprov_open(node->sf_sffs->sf_handle, node->sf_path, &fp);
+        error = sfprov_open(node->sf_sffs->sf_handle, node->sf_path, &fp, flag);
         if (error == 0)
+        {
                 node->sf_file = fp;
+                node->sf_flag = flag;
+        }
+        else
+                node->sf_flag = ~0;
 }
 
@@ -256 +261 @@
         node->sf_is_stale = 0;  /* never stale at creation */
         node->sf_file = fp;
+        node->sf_flag = ~0;
         node->sf_vnode = NULL;  /* do this before any sfnode_get_vnode() */
         node->sf_children = 0;
@@ -699 +705 @@
         int             *eofp,
         caller_context_t *ct,
-        int             flags)
+        int             flag)
 {
         sfnode_t *dir = VN2SFN(vp);
@@ -734 +740 @@
         if (dir->sf_dir_list == NULL) {
                 error = sfprov_readdir(dir->sf_sffs->sf_handle, dir->sf_path,
-                    &dir->sf_dir_list);
+                    &dir->sf_dir_list, flag);
                 if (error != 0)
                         goto done;
@@ -1032 +1038 @@
 
         mutex_enter(&sffs_lock);
-        sfnode_open(node);
         if (node->sf_file == NULL) {
-                mutex_exit(&sffs_lock);
-                return (EINVAL);
+                ASSERT(node->sf_flag != ~0);
+                sfnode_open(node, node->sf_flag);
+                if (node->sf_file == NULL)
+                        return (EBADF);
         }
 
@@ -1083 +1090 @@
          */
         mutex_enter(&sffs_lock);
-        sfnode_open(node);
         if (node->sf_file == NULL) {
-                mutex_exit(&sffs_lock);
-                return (EINVAL);
+                ASSERT(node->sf_flag != ~0);
+                sfnode_open(node, node->sf_flag);
+                if (node->sf_file == NULL)
+                        return (EBADF);
         }
 
@@ -1305 +1313 @@
                 if (vp->v_type == VREG && (vap->va_mask & AT_SIZE) &&
                     vap->va_size == 0) {
-                        sfnode_open(node);
-                        if (node->sf_path == NULL)
-                                error = ENOENT;
-                        else
-                                error = sfprov_trunc(node->sf_sffs->sf_handle,
-                                    node->sf_path);
-                        if (error) {
+                        sfnode_open(node, flag | FTRUNC);
+                        if (node->sf_path == NULL) {
                                 mutex_exit(&sffs_lock);
                                 VN_RELE(vp);
-                                return (error);
+                                return (ENOENT);
                         }
                 }
@@ -2219 +2222 @@
 
 /*
- * All the work for this is really done in lookup.
+ * All the work for this is really done in sffs_lookup().
  */
 /*ARGSUSED*/
@@ -2231 +2234 @@
 
         node = VN2SFN(*vpp);
-        sfnode_open(node);
+        sfnode_open(node, flag);
         if (node->sf_file == NULL)
                 error = EINVAL;
-
         mutex_exit(&sffs_lock);
 

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h

@@ -53 +53 @@
         vnode_t         *sf_vnode;      /* vnode if active */
         sfp_file_t      *sf_file;       /* non NULL if open */
+    int                 sf_flag;    /* last opened file-mode. */
         struct sfnode   *sf_parent;     /* parent sfnode of this one */
         uint16_t        sf_children;    /* number of children sfnodes */