Changeset 30527 in vbox

Timestamp:

Jun 30, 2010 1:11:55 PM (15 years ago)

Author:

vboxsync

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

63234

Message:

Additions/Solaris/SharedFolders: optionally honor fsync requests from the guest.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

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

r30519	r30527
54	54	" gid=GID set the default file owner group id to GID\n"
55	55	" stat_ttl=TTL set the \"time to live\" (in ms) for the stat caches (default %d)\n"
	56	" fsync honor fsync calls instead of ignoring them\n"
56	57	" ttl=TTL set the \"time to live\" to TID for the dentry\n"
57	58	" iocharset CHARSET use the character set CHARSET for i/o operations (default utf8)\n"

-              r30519
+              r30527
         if (RT_FAILURE(rc))
                 return (EINVAL);
+        return (0);
+}
+int
+sfprov_fsync(sfp_file_t *fp)
+{
+        int rc;
+        rc = vboxCallFlush(&vbox_client, &fp->map, fp->handle);
+        if (RT_FAILURE(rc))
+                return (EIO);
         return (0);
+}

r30519	r30527
84	84	extern int sfprov_write(sfp_file_t , char buffer, uint64_t offset,
85	85	uint32_t *numbytes);
	86	extern int sfprov_fsync(sfp_file_t *fp);
86	87
87	88

-              r30519
+              r30527
         {"uid",         NULL,           NULL,   MO_HASVALUE,    NULL},
         {"gid",         NULL,           NULL,   MO_HASVALUE,    NULL},
+        {"stat_ttl",    NULL,           NULL,   MO_HASVALUE,    NULL}
+        {"stat_ttl",    NULL,           NULL,   MO_HASVALUE,    NULL},
+        {"fsync",       NULL,           NULL,   0,              NULL}
 };
 …
         gid_t gid = 0;
         int stat_ttl = DEF_STAT_TTL_MS;
+        int fsync = 0;
         char *optval;
         long val;
 …
             (int)val == val)
                 stat_ttl = val;
+        /*
+         * whether to honor fsync
+         */
+        if (vfs_optionisset(vfsp, "fsync", &optval))
+                fsync = 1;
         /*
 …
         sffs->sf_gid = gid;
         sffs->sf_stat_ttl = stat_ttl;
+        sffs->sf_fsync = fsync;
         sffs->sf_share_name = share_name;
         sffs->sf_mntpath = mount_point;

r30519	r30527
32	32	gid_t sf_gid; /* group of all shared folders */
33	33	int sf_stat_ttl; /* ttl for stat caches (in ms) */
	34	int sf_fsync; /* whether to honor fsync or not */
34	35	char *sf_share_name;
35	36	char sf_mntpath; / name of mount point */

-              r30519
+              r30527
 sffs_fsync(vnode_t *vp, int flag, cred_t *cr, caller_context_t *ct)
+{
-#if 0
         sfnode_t *node;
+        int             error;
         /*
          * Ask the host to sync any data it may have cached for open files.
-         * I don't think we care about errors.
          */
         mutex_enter(&sffs_lock);
         node = VN2SFN(vp);
+        if (node->sf_file != NULL)
+                (void) sfprov_fsync(node->sf_file);
+        if (node->sf_file == NULL)
+                error = EBADF;
+        else if (node->sf_sffs->sf_fsync)
+                error = sfprov_fsync(node->sf_file);
+        else
+                error = 0;
         mutex_exit(&sffs_lock);
+#endif
+        return (0);
+        return (error);
+}

Note: See TracChangeset for help on using the changeset viewer.