Changeset 28253 in vbox for trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

Timestamp:

Apr 13, 2010 2:14:07 PM (15 years ago)

Author:

vboxsync

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

59994

Message:

SharedFolders/linux: Don't close an inode for a regular file after it was created with sf_create(). We assume that this inode will be opened with sf_reg_open() and later closed with sf_reg_close(). Fixes copying of read-only files on shared folders.

File:

• trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (modified) (11 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -296 +296 @@
                         goto fail1;
                 }
+                sf_new_i->handle = SHFL_HANDLE_NIL;
 
                 ino = iunique (parent->i_sb, 1);
@@ -338 +339 @@
 sf_instantiate (const char *caller, struct inode *parent,
                 struct dentry *dentry, SHFLSTRING *path,
-                RTFSOBJINFO *info)
+                RTFSOBJINFO *info, SHFLHANDLE handle)
 {
         int err;
@@ -379 +380 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
-                unlock_new_inode(inode);
-#endif
-
+        unlock_new_inode(inode);
+#endif
+
+        /* Store this handle if we leave the handle open. */
+        sf_new_i->handle = handle;
         return 0;
 
@@ -392 +395 @@
 
 static int
-sf_create_aux (struct inode *parent, struct dentry *dentry, int mode, int dirop)
+sf_create_aux (struct inode *parent, struct dentry *dentry, int mode, int fDirectory)
 {
         int rc, err;
@@ -418 +421 @@
                 | SHFL_CF_ACT_FAIL_IF_EXISTS
                 | SHFL_CF_ACCESS_READWRITE
-                | (dirop ? SHFL_CF_DIRECTORY : 0)
+                | (fDirectory ? SHFL_CF_DIRECTORY : 0)
                 ;
 
         params.Info.Attr.fMode = 0
-                | (dirop ? RTFS_TYPE_DIRECTORY : RTFS_TYPE_FILE)
+                | (fDirectory ? RTFS_TYPE_DIRECTORY : RTFS_TYPE_FILE)
                 | (mode & S_IRWXUGO)
                 ;
@@ -433 +436 @@
         }
 
-        LogFunc(("calling vboxCallCreate, folder %s, flags %#x\n",
+        LogFunc(("sf_create_aux: calling vboxCallCreate, folder %s, flags %#x\n",
                  path->String.utf8, params.CreateFlags));
         rc = vboxCallCreate (&client_handle, &sf_g->map, path, &params);
@@ -442 +445 @@
                 }
                 err = -EPROTO;
-                LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Rrc\n", dirop,
-                         sf_i->path->String.utf8, rc));
+                LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Rrc\n",
+                         fDirectory, sf_i->path->String.utf8, rc));
                 goto fail0;
         }
@@ -449 +452 @@
         if (params.Result != SHFL_FILE_CREATED) {
                 err = -EPERM;
-                LogFunc(("(%d): could not create file %s result=%d\n", dirop,
-                         sf_i->path->String.utf8, params.Result));
+                LogFunc(("(%d): could not create file %s result=%d\n",
+                         fDirectory, sf_i->path->String.utf8, params.Result));
                 goto fail0;
         }
 
-        err = sf_instantiate (__func__, parent, dentry, path, &params.Info);
+        err = sf_instantiate (__func__, parent, dentry, path, &params.Info,
+                             fDirectory ? SHFL_HANDLE_NIL : params.Handle);
         if (err) {
                 LogFunc(("(%d): could not instantiate dentry for %s err=%d\n",
-                         dirop, sf_i->path->String.utf8, err));
+                         fDirectory, sf_i->path->String.utf8, err));
                 goto fail1;
         }
 
-        rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
-        if (RT_FAILURE (rc)) {
-                LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", dirop, rc));
+        /* 
+         * Don't close this handle right now. We assume that the same file is
+         * opened with sf_reg_open() and later closed with sf_reg_close(). Save
+         * the handle in between. Does not apply to directories. True?
+         */
+        if (fDirectory)
+        {
+                rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
+                if (RT_FAILURE (rc)) {
+                        LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
+                }
         }
 
@@ -472 +484 @@
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
         if (RT_FAILURE (rc)) {
-                LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", dirop, rc));
+                LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
         }
 
@@ -499 +511 @@
 
 static int
-sf_unlink_aux (struct inode *parent, struct dentry *dentry, int dirop)
+sf_unlink_aux (struct inode *parent, struct dentry *dentry, int fDirectory)
 {
         int rc, err;
@@ -515 +527 @@
 
         rc = vboxCallRemove (&client_handle, &sf_g->map, path,
-                             dirop ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE);
+                             fDirectory ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE);
         if (RT_FAILURE (rc)) {
-                LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Rrc\n", dirop,
+                LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Rrc\n", fDirectory,
                          path->String.utf8, rc));
                          err = -RTErrConvertToErrno (rc);