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

Timestamp:

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

Author:

vboxsync

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/regops.c (modified) (3 diffs)

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

@@ -271 +271 @@
         }
 
+        /* Already open? */
+        if (sf_i->handle != SHFL_HANDLE_NIL)
+        {
+            /*
+             * This inode was created with sf_create_aux(). Check the CreateFlags:
+             * O_CREAT, O_TRUNC: inherent true (file was just created). Not sure
+             * about the access flags (SHFL_CF_ACCESS_*).
+             */
+            sf_i->force_restat = 1;
+            sf_r->handle = sf_i->handle;
+            sf_i->handle = SHFL_HANDLE_NIL;
+            sf_i->file = file;
+            file->private_data = sf_r;
+            return 0;
+        }
+
         RT_ZERO(params);
         params.Handle = SHFL_HANDLE_NIL;
@@ -328 +344 @@
 
         params.Info.Attr.fMode = inode->i_mode;
-        LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%d, %#x\n",
+        LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%#x, %#x\n",
                  sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
         rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
@@ -382 +398 @@
         kfree (sf_r);
         sf_i->file = NULL;
+        sf_i->handle = SHFL_HANDLE_NIL;
         file->private_data = NULL;
         return 0;