Changeset 4729 in vbox for trunk/src

Timestamp:

Sep 12, 2007 11:45:18 AM (17 years ago)

Author:

vboxsync

Message:

Restructured the Linux shared folders guest module and made it use backdoor logging

Location:

trunk/src/VBox/Additions/linux

Files:

• module/Makefile.module (modified) (1 diff)
• module/files_vboxadd (modified) (1 diff)
• sharedfolders/Makefile.kmk (modified) (1 diff)
• sharedfolders/Makefile.module (modified) (2 diffs)
• sharedfolders/dirops.c (modified) (28 diffs)
• sharedfolders/files_vboxvfs (modified) (2 diffs)
• sharedfolders/regops.c (modified) (17 diffs)
• sharedfolders/utils.c (modified) (26 diffs)
• sharedfolders/vfsmod.c (modified) (22 diffs)
• sharedfolders/vfsmod.h (modified) (2 diffs)

trunk/src/VBox/Additions/linux/module/Makefile.module

@@ -36 +36 @@
         strformatrt.o \
         strformat-vbox.o \
+        divdi3.o \
+        moddi3.o \
         udivdi3.o \
         umoddi3.o \

trunk/src/VBox/Additions/linux/module/files_vboxadd

@@ -48 +48 @@
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/divdi3.c=>divdi3.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/moddi3.c=>moddi3.c \
     ${PATH_ROOT}/src/VBox/Runtime/math/gcc/qdivrem.c=>qdivrem.c \
     ${PATH_ROOT}/src/VBox/Runtime/math/gcc/quad.h=>quad.h \

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

@@ -44 +44 @@
 #
 vboxvfs_TEMPLATE        = VBOXLNX32GUESTR0
-vboxvfs_DEFS           := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
+vboxvfs_DEFS           := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) \
+                          KBUILD_BASENAME=KBUILD_STR\(vboxadd\) \
+                          MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
 vboxvfs_LIBS            = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
-vboxvfs_SOURCES         = vfsmod.c
+vboxvfs_SOURCES         = \
+        vfsmod.c \
+        utils.c \
+        dirops.c \
+        regops.c
 vboxvfs_NOINST          = 1
 vboxvfs_CFLAGS         += -fshort-wchar

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -18 +18 @@
 OBJS   = \
         vfsmod.o \
+        dirops.o \
+        regops.o \
+        utils.o \
         GenericRequest.o \
         SysHlp.o \
@@ -28 +31 @@
         r0drv/linux/alloc-r0drv-linux.o \
         r0drv/linux/semaphore-r0drv-linux.o
+#ifdef DEBUG
+OBJS  += \
+        divdi3.o \
+        moddi3.o \
+        udivdi3.o \
+        umoddi3.o \
+        qdivrem.o
+#endif
+
+
 EXTRA_CFLAGS = -fshort-wchar
 

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

@@ -17 +17 @@
  */
 
+#include "vfsmod.h"
+
 static int
 sf_dir_open (struct inode *inode, struct file *file)
@@ -32 +34 @@
 
         if (file->private_data) {
-                elog ("dir_open called on already opened directory %s\n",
-                      sf_i->path->String.utf8);
+                LogFunc(("dir_open called on already opened directory %s\n",
+                         sf_i->path->String.utf8));
                 return 0;
         }
@@ -40 +42 @@
 
         if (!sf_d) {
-                elog ("could not allocate directory info for %s\n",
-                      sf_i->path->String.utf8);
+                LogRelPrintFunc("could not allocate directory info for");
+                LogRelPrint(sf_i->path->String.utf8);
+                LogRelPrint("\n");
                 return -ENOMEM;
         }
@@ -51 +54 @@
                 ;
 
+        LogFunc(("sf_dir_open: calling vboxCallCreate, folder %s, flags %#x\n",
+                 sf_i->path->String.utf8, params.CreateFlags));
         rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxCallCreate(%s) failed rc=%d\n",
-                      sf_i->path->String.utf8, rc);
+                LogFunc(("vboxCallCreate(%s) failed rc=%Vrc\n",
+                         sf_i->path->String.utf8, rc));
                 sf_dir_info_free (sf_d);
                 return -EPERM;
@@ -60 +65 @@
 
         if (params.Result != SHFL_FILE_EXISTS) {
-                elog ("directory %s does not exist\n", sf_i->path->String.utf8);
+                LogFunc(("directory %s does not exist\n", sf_i->path->String.utf8));
                 sf_dir_info_free (sf_d);
                 return -ENOENT;
@@ -69 +74 @@
                 rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
                 if (VBOX_FAILURE (rc)) {
-                        elog ("vboxCallClose(%s) after err=%d failed rc=%d\n",
-                              sf_i->path->String.utf8, err, rc);
+                        LogFunc(("vboxCallClose(%s) after err=%d failed rc=%Vrc\n",
+                                 sf_i->path->String.utf8, err, rc));
                 }
                 sf_dir_info_free (sf_d);
@@ -79 +84 @@
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxCallClose(%s) failed rc=%d\n",
-                      sf_i->path->String.utf8, rc);
+                LogFunc(("vboxCallClose(%s) failed rc=%Vrc\n",
+                          sf_i->path->String.utf8, rc));
         }
 
@@ -196 +201 @@
                         default:
                                 /* skip erroneous entry and proceed */
-                                elog ("sf_getdent error %d\n", err);
+                                LogFunc(("sf_getdent error %d\n", err));
                                 dir->f_pos += 1;
                                 continue;
@@ -206 +211 @@
                 fake_ino = sanity;
                 if (sanity - fake_ino) {
-                        elog2 ("can not compute ino\n");
+                        LogRelPrintFunc("can not compute ino\n");
                         return -EINVAL;
                 }
@@ -213 +218 @@
                                dir->f_pos, fake_ino, DT_UNKNOWN);
                 if (err) {
-                        DBGC elog ("filldir returned error %d\n", err);
+                        LogFunc(("filldir returned error %d\n", err));
                         /* Rely on the fact that filldir returns error
                            only when it runs out of space in opaque */
@@ -225 +230 @@
 }
 
-static struct file_operations sf_dir_fops = {
+struct file_operations sf_dir_fops = {
         .open    = sf_dir_open,
         .readdir = sf_dir_read,
@@ -281 +286 @@
                 sf_new_i = kmalloc (sizeof (*sf_new_i), GFP_KERNEL);
                 if (!sf_new_i) {
-                        elog2 ("could not allocate memory for new inode info\n");
+                        LogRelPrintFunc("could not allocate memory for new inode info\n");
                         err = -ENOMEM;
                         goto fail1;
@@ -289 +294 @@
                 inode = iget (parent->i_sb, ino);
                 if (!inode) {
-                        elog2 ("iget failed\n");
+                        LogFunc(("iget failed\n"));
                         err = -ENOMEM;          /* XXX: ??? */
                         goto fail2;
@@ -332 +337 @@
         sf_new_i = kmalloc (sizeof (*sf_new_i), GFP_KERNEL);
         if (!sf_new_i) {
-                elog3 ("%s: %s: could not allocate inode info\n",
-                       caller, __func__);
+                LogRelPrintFunc("could not allocate inode info.  caller=");
+                LogRelPrint(caller);
+                LogRelPrint("\n");
                 err = -ENOMEM;
                 goto fail0;
@@ -341 +347 @@
         inode = iget (parent->i_sb, ino);
         if (!inode) {
-                elog3 ("%s: %s: iget failed\n", caller, __func__);
+                LogFunc(("iget failed.  caller=%s\n", caller));
                 err = -ENOMEM;
                 goto fail1;
@@ -403 +409 @@
         }
 
+        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);
         if (VBOX_FAILURE (rc)) {
                 err = -EPROTO;
-                elog ("(%d): vboxCallCreate(%s) failed rc=%d\n", dirop,
-                      sf_i->path->String.utf8, rc);
+                LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Vrc\n", dirop,
+                         sf_i->path->String.utf8, rc));
                 goto fail0;
         }
@@ -413 +421 @@
         if (params.Result != SHFL_FILE_CREATED) {
                 err = -EPERM;
-                elog ("(%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", dirop,
+                         sf_i->path->String.utf8, params.Result));
                 goto fail0;
         }
@@ -420 +428 @@
         err = sf_instantiate (__func__, parent, dentry, path, &params.Info);
         if (err) {
-                elog ("(%d): could not instantiate dentry for %s err=%d\n",
-                      dirop, sf_i->path->String.utf8, err);
+                LogFunc(("(%d): could not instantiate dentry for %s err=%d\n",
+                         dirop, sf_i->path->String.utf8, err));
                 goto fail1;
         }
@@ -427 +435 @@
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("(%d): vboxCallClose failed rc=%d\n", dirop, rc);
+                LogFunc(("(%d): vboxCallClose failed rc=%Vrc\n", dirop, rc));
         }
 
@@ -436 +444 @@
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("(%d): vboxCallClose failed rc=%d\n", dirop, rc);
+                LogFunc(("(%d): vboxCallClose failed rc=%Vrc\n", dirop, rc));
         }
 
@@ -481 +489 @@
                              dirop ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE);
         if (VBOX_FAILURE (rc)) {
-                DBGC elog ("(%d): vboxCallRemove(%s) failed rc=%d\n", dirop,
-                           path->String.utf8, rc);
+                LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
+                         path->String.utf8, rc));
 
                 switch (rc) {
@@ -495 +503 @@
                         default:
                                 err = -EPROTO;
-                                elog ("(%d): vboxCallRemove(%s) failed rc=%d\n", dirop,
-                                      path->String.utf8, rc);
+                                LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
+                                         path->String.utf8, rc));
                                 break;
                 }
@@ -535 +543 @@
         SHFLSTRING *old_path;
         SHFLSTRING *new_path;
+        int is_dir = ((old_dentry->d_inode->i_mode & S_IFDIR) != 0);
 
         TRACE ();
@@ -541 +550 @@
 
         if (sf_g != GET_GLOB_INFO (new_parent->i_sb)) {
-                elog2 ("rename with different roots\n");
+                LogFunc(("rename with different roots\n"));
                 return -EINVAL;
         }
@@ -548 +557 @@
                                    old_dentry, &old_path);
         if (err) {
-                elog2 ("failed to create old path\n");
+                LogFunc(("failed to create old path\n"));
                 return err;
         }
@@ -555 +564 @@
                                    new_dentry, &new_path);
         if (err) {
-                elog2 ("failed to create new path\n");
+                LogFunc(("failed to create new path\n"));
                 goto fail0;
         }
 
         rc = vboxCallRename (&client_handle, &sf_g->map, old_path,
-                             new_path, SHFL_RENAME_FILE);
+                             new_path, is_dir ? 0 : SHFL_RENAME_FILE);
         if (VBOX_FAILURE (rc)) {
                 switch (rc) {
+                        /** @todo we need a function to convert VBox error
+                            codes back to Linux. */
+                        case VERR_ACCESS_DENIED:
+                                err = -EACCES;
+                                goto fail1;
+                        case VERR_DEV_IO_ERROR:
+                                return -EBUSY;
+                                goto fail1;
+                        case VERR_INVALID_POINTER:
+                                return -EFAULT;
+                                goto fail1;
                         case VERR_FILE_NOT_FOUND:
                         case VERR_PATH_NOT_FOUND:
@@ -570 +590 @@
                         default:
                                 err = -EPROTO;
-                                elog ("vboxCallRename failed rc=%d\n", rc);
+                                LogFunc(("vboxCallRename failed rc=%Vrc\n", rc));
                                 goto fail1;
                 }
@@ -586 +606 @@
 }
 
-static struct inode_operations sf_dir_iops = {
+struct inode_operations sf_dir_iops = {
         .lookup     = sf_lookup,
         .create     = sf_create,

trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs

@@ -14 +14 @@
 
 FILES_VBOXVFS_NOBIN=" \
+    ${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
     ${PATH_ROOT}/include/iprt/alloc.h=>include/iprt/alloc.h \
     ${PATH_ROOT}/include/iprt/asm.h=>include/iprt/asm.h \
@@ -51 +52 @@
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp=>VMMDev.c \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/divdi3.c=>divdi3.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/moddi3.c=>moddi3.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/qdivrem.c=>qdivrem.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/quad.h=>quad.h \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/udivdi3.c=>udivdi3.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/umoddi3.c=>umoddi3.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \

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

@@ -21 +21 @@
  */
 
+#include "vfsmod.h"
+
 #define CHUNK_SIZE 4096
 
@@ -32 +34 @@
                                pos, nread, buf, false /* already locked? */);
         if (VBOX_FAILURE (rc)) {
-                elog3 ("%s: %s: vboxCallRead failed rc=%d\n",
-                       caller, __func__, rc);
+                LogFunc(("vboxCallRead failed.  caller=%s, rc=%Vrc\n",
+                         caller, rc));
                 return -EPROTO;
         }
@@ -53 +55 @@
         TRACE ();
         if (!S_ISREG (inode->i_mode)) {
-                elog ("read from non regular file %d\n", inode->i_mode);
+                LogFunc(("read from non regular file %d\n", inode->i_mode));
                 return -EINVAL;
         }
@@ -63 +65 @@
         tmp = kmalloc (CHUNK_SIZE, GFP_KERNEL);
         if (!tmp) {
-                elog ("could not allocate bounce buffer memory %u bytes\n",
-                      CHUNK_SIZE);
+                LogRelPrintFunc("could not allocate bounce buffer memory ");
+                LogRelPrintQuote(CHUNK_SIZE);
+                LogRelPrint(" bytes\n");
                 return -ENOMEM;
         }
@@ -124 +127 @@
 
         if (!S_ISREG (inode->i_mode)) {
-                elog ("write to non regular file %d\n",  inode->i_mode);
+                LogFunc(("write to non regular file %d\n",  inode->i_mode));
                 return -EINVAL;
         }
@@ -134 +137 @@
         tmp = kmalloc (CHUNK_SIZE, GFP_KERNEL);
         if (!tmp) {
-                elog ("could not allocate bounce buffer memory %u bytes\n",
-                      CHUNK_SIZE);
+                LogRelPrintFunc("could not allocate bounce buffer memory ");
+                LogRelPrintQuote(CHUNK_SIZE);
+                LogRelPrint("bytes\n");
                 return -ENOMEM;
         }
@@ -158 +162 @@
                 if (VBOX_FAILURE (rc)) {
                         err = -EPROTO;
-                        elog ("vboxCallWrite(%s) failed rc=%d\n",
-                              sf_i->path->String.utf8, rc);
+                        LogFunc(("vboxCallWrite(%s) failed rc=%Vrc\n",
+                                 sf_i->path->String.utf8, rc));
                         goto fail;
                 }
@@ -189 +193 @@
 sf_reg_open (struct inode *inode, struct file *file)
 {
-        int rc;
+        int rc, rc_linux = 0;
         struct sf_glob_info *sf_g = GET_GLOB_INFO (inode->i_sb);
         struct sf_inode_info *sf_i = GET_INODE_INFO (inode);
@@ -201 +205 @@
         sf_r = kmalloc (sizeof (*sf_r), GFP_KERNEL);
         if (!sf_r) {
-                elog2 ("could not allocate reg info\n");
+                LogRelPrintFunc("could not allocate reg info\n");
                 return -ENOMEM;
         }
 
-#if 0
-        printk ("open %s\n", sf_i->path->String.utf8);
-#endif
+        LogFunc(("open %s\n", sf_i->path->String.utf8));
 
         params.CreateFlags = 0;
         params.Info.cbObject = 0;
+        /* We check this afterwards to find out if the call succeeded
+           or failed, as the API does not seem to cleanly distinguish
+           error and informational messages. */
+        params.Handle = 0;
 
         if (file->f_flags & O_CREAT) {
+                LogFunc(("O_CREAT set\n"));
+                params.CreateFlags |= SHFL_CF_ACT_CREATE_IF_NEW;
                 if (file->f_flags & O_EXCL) {
-                        params.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
+                        LogFunc(("O_EXCL set\n"));
                         params.CreateFlags |= SHFL_CF_ACT_FAIL_IF_EXISTS;
                 }
                 else {
-                        params.CreateFlags |= SHFL_CF_ACT_CREATE_IF_NEW;
-                        params.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
+                        /* O_TRUNC combined with O_EXCL is undefined. */
                         if (file->f_flags & O_TRUNC) {
+                                LogFunc(("O_TRUNC set\n"));
                                 params.CreateFlags |= SHFL_CF_ACT_OVERWRITE_IF_EXISTS;
                         }
@@ -229 +237 @@
         }
         else {
+                params.CreateFlags |= SHFL_CF_ACT_FAIL_IF_NEW;
                 if (file->f_flags & O_TRUNC) {
-                        params.CreateFlags |= SHFL_CF_ACCESS_READWRITE;
+                        LogFunc(("O_TRUNC set\n"));
                         params.CreateFlags |= SHFL_CF_ACT_OVERWRITE_IF_EXISTS;
-                }
-                else {
-                        params.CreateFlags |= SHFL_CF_ACT_FAIL_IF_NEW;
                 }
         }
@@ -257 +263 @@
         }
 
+        LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%d, %#x\n",
+                 sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
         rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
 
-        /* XXX: here i probably should check rc and convert some values to
-           EEXISTS ENOENT etc */
-        if (VBOX_FAILURE (rc))  
-        {
-            elog ("vboxCallCreate failed flags=%d,%#x rc=%d\n",
-                  file->f_flags, params.CreateFlags, rc);
-            kfree (sf_r);
-            return -EPROTO;
-        }
-
-        /** @todo handle these return codes!! */
-        switch (params.Result)
-        {
-        case SHFL_PATH_NOT_FOUND:
-            break;
-        case SHFL_FILE_NOT_FOUND:
-            break;
-        case SHFL_FILE_EXISTS:
-            break;
-        case SHFL_FILE_REPLACED:
-            break;
-        case SHFL_FILE_CREATED:
-            break;
+        if (VBOX_FAILURE (rc)) {
+                LogFunc(("vboxCallCreate failed flags=%d,%#x rc=%Vrc\n",
+                         file->f_flags, params.CreateFlags, rc));
+                kfree (sf_r);
+                return -EPROTO;
+        }
+
+        if (SHFL_HANDLE_NIL == params.Handle) {
+                switch (params.Result) {
+                case SHFL_PATH_NOT_FOUND:
+                case SHFL_FILE_NOT_FOUND:
+                        rc_linux = -ENOENT;
+                        break;
+                case SHFL_FILE_EXISTS:
+                        rc_linux = -EEXIST;
+                        break;
+                default:
+                        break;
+                }
         }
 
@@ -287 +291 @@
         sf_r->handle = params.Handle;
         file->private_data = sf_r;
-        return 0;
+        return rc_linux;
 }
 
@@ -306 +310 @@
         rc = vboxCallClose (&client_handle, &sf_g->map, sf_r->handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxCallClose failed rc=%d\n", rc);
+                LogFunc(("vboxCallClose failed rc=%Vrc\n", rc));
         }
 
@@ -341 +345 @@
         page = alloc_page (GFP_HIGHUSER);
         if (!page) {
-                elog2 ("failed to allocate page\n");
+                LogRelPrintFunc("failed to allocate page\n");
                 SET_TYPE (VM_FAULT_OOM);
                 return NOPAGE_OOM;
@@ -384 +388 @@
         TRACE ();
         if (vma->vm_flags & VM_SHARED) {
-                elog2 ("shared mmapping not available\n");
+                LogFunc(("shared mmapping not available\n"));
                 return -EINVAL;
         }
@@ -392 +396 @@
 }
 
-static struct file_operations sf_reg_fops = {
+struct file_operations sf_reg_fops = {
         .read    = sf_reg_read,
         .open    = sf_reg_open,
@@ -403 +407 @@
 /* iops */
 
-static struct inode_operations sf_reg_iops = {
+struct inode_operations sf_reg_iops = {
 #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
         .revalidate = sf_inode_revalidate

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

@@ -18 +18 @@
  */
 
+#include "vfsmod.h"
+
 /* #define USE_VMALLOC */
 
@@ -43 +45 @@
 
 /* set [inode] attributes based on [info], uid/gid based on [sf_g] */
-static void
+void
 sf_init_inode (struct sf_glob_info *sf_g, struct inode *inode,
                RTFSOBJINFO *info)
@@ -101 +103 @@
 }
 
-static int
+int
 sf_stat (const char *caller, struct sf_glob_info *sf_g,
          SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail)
@@ -110 +112 @@
         TRACE ();
         params.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
+        LogFunc(("calling vboxCallCreate, file %s, flags %#x\n",
+                 path->String.utf8, params.CreateFlags));
         rc = vboxCallCreate (&client_handle, &sf_g->map, path, &params);
         if (VBOX_FAILURE (rc)) {
-                elog3 ("%s: %s: vboxCallCreate(%s) failed rc=%d\n",
-                       caller, __func__, path->String.utf8, rc);
+                LogFunc(("vboxCallCreate(%s) failed.  caller=%s, rc=%Vrc\n",
+                         path->String.utf8, rc, caller));
                 return -EPROTO;
         }
@@ -119 +123 @@
         if (params.Result != SHFL_FILE_EXISTS) {
                 if (!ok_to_fail) {
-                        elog3 ("%s: %s: vboxCallCreate(%s)"
-                               " file does not exist result=%d\n",
-                               caller, __func__, path->String.utf8, params.Result);
+                        LogFunc(("vboxCallCreate(%s) file does not exist.  caller=%s, result=%d\n",
+                                 path->String.utf8, params.Result, caller));
                 }
                 return -ENOENT;
@@ -146 +149 @@
         TRACE ();
         if (!dentry || !dentry->d_inode) {
-                DBGC elog ("no dentry(%p) or inode(%p)\n", dentry, dentry->d_inode);
+                LogFunc(("no dentry(%p) or inode(%p)\n", dentry, dentry->d_inode));
                 return -EINVAL;
         }
@@ -201 +204 @@
    [generic_fillattr] */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
-static int
+int
 sf_getattr (struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat)
 {
@@ -240 +243 @@
                 path_len = p_len + d_len + 2;
                 if (path_len > 0xffff) {
-                        elog ("%s: path to big %zu\n", caller, path_len);
+                        LogFunc(("path too long.  caller=%s, path_len=%zu\n", caller, path_len));
                         return -ENAMETOOLONG;
                 }
@@ -248 +251 @@
         tmp = kmalloc (shflstring_len, GFP_KERNEL);
         if (!tmp) {
-                elog ("%s: kmalloc failed\n", caller);
+                LogRelPrintFunc("kmalloc failed, caller=");
+                LogRelPrint(caller);
                 return -ENOMEM;
         }
@@ -272 +276 @@
    to [sf_g]->nls, we must convert it to UTF8 here and pass down to
    [sf_make_path] which will allocate SHFLSTRING and fill it in */
-static int
+int
 sf_path_from_dentry (const char *caller, struct sf_glob_info *sf_g,
                      struct sf_inode_info *sf_i, struct dentry *dentry,
@@ -307 +311 @@
                         nb = sf_g->nls->char2uni (in, in_len, &uni);
                         if (nb < 0) {
-                                elog ("nls->char2uni failed %x %d\n",
-                                      *in, in_len);
+                                LogFunc(("nls->char2uni failed %x %d\n",
+                                         *in, in_len));
                                 err = -EINVAL;
                                 goto fail1;
@@ -317 +321 @@
                         nb = utf8_wctomb (out, uni, out_bound_len);
                         if (nb < 0) {
-                                elog ("nls->uni2char failed %x %d\n",
-                                      uni, out_bound_len);
+                                LogFunc(("nls->uni2char failed %x %d\n",
+                                         uni, out_bound_len));
                                 err = -EINVAL;
                                 goto fail1;
@@ -331 +335 @@
                 }
 
-                DBGC printk (KERN_DEBUG "result(%d) = %.*s\n", len, len, name);
+                LogFunc(("result(%d) = %.*s\n", len, len, name));
                 *out = 0;
         }
@@ -350 +354 @@
 }
 
-static int
+int
 sf_nlscpy (struct sf_glob_info *sf_g,
            char *name, size_t name_bound_len,
@@ -375 +379 @@
                         nb = utf8_mbtowc (&uni, in, in_bound_len);
                         if (nb < 0) {
-                                elog ("utf8_mbtowc failed(%s) %x:%d\n",
-                                      utf8_name, *in, in_bound_len);
+                                LogFunc(("utf8_mbtowc failed(%s) %x:%d\n",
+                                         (const char *) utf8_name, *in, in_bound_len));
                                 return -EINVAL;
                         }
@@ -384 +388 @@
                         nb = sf_g->nls->uni2char (uni, out, out_bound_len);
                         if (nb < 0) {
-                                elog ("nls->uni2char failed(%s) %x:%d\n",
-                                      utf8_name, uni, out_bound_len);
+                                LogFunc(("nls->uni2char failed(%s) %x:%d\n",
+                                         utf8_name, uni, out_bound_len));
                                 return nb;
                         }
@@ -415 +419 @@
         b = kmalloc (sizeof (*b), GFP_KERNEL);
         if (!b) {
-                elog2 ("could not alloc directory buffer\n");
+                LogRelPrintFunc("could not alloc directory buffer\n");
                 return NULL;
         }
@@ -426 +430 @@
         if (!b->buf) {
                 kfree (b);
-                elog2 ("could not alloc directory buffer storage\n");
+                LogRelPrintFunc("could not alloc directory buffer storage\n");
                 return NULL;
         }
@@ -452 +456 @@
 }
 
-static void
+void
 sf_dir_info_free (struct sf_dir_info *p)
 {
@@ -468 +472 @@
 }
 
-static struct sf_dir_info *
+struct sf_dir_info *
 sf_dir_info_alloc (void)
 {
@@ -476 +480 @@
         p = kmalloc (sizeof (*p), GFP_KERNEL);
         if (!p) {
-                elog2 ("could not alloc directory info\n");
+                LogRelPrintFunc("could not alloc directory info\n");
                 return NULL;
         }
@@ -507 +511 @@
 }
 
-static int
+int
 sf_dir_read_all (struct sf_glob_info *sf_g, struct sf_inode_info *sf_i,
                  struct sf_dir_info *sf_d, SHFLHANDLE handle)
@@ -532 +536 @@
                         if (!b) {
                                 err = -ENOMEM;
-                                elog2 ("could not alloc directory buffer\n");
+                                LogRelPrintFunc("could not alloc directory buffer\n");
                                 goto fail1;
                         }
@@ -560 +564 @@
 
                         case VERR_NO_TRANSLATION:
-                                elog2 ("host could not translte entry\n");
+                                LogFunc(("host could not translate entry\n"));
                                 /* XXX */
                                 break;
@@ -566 +570 @@
                         default:
                                 err = -EPROTO;
-                                elog ("vboxCallDirInfo failed rc=%d\n", rc);
+                                LogFunc(("vboxCallDirInfo failed rc=%Vrc\n", rc));
                                 goto fail1;
                 }
@@ -587 +591 @@
 }
 
-static struct dentry_operations sf_dentry_ops = {
+struct dentry_operations sf_dentry_ops = {
         .d_revalidate = sf_dentry_revalidate
 };

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

@@ -22 +22 @@
  */
 
-#include "the-linux-kernel.h"
-#include "version-generated.h"
-
 /*
  * Suppress the definition of wchar_t from stddef.h that occurs below.
@@ -34 +31 @@
 #endif
 #endif
+
 #include "vfsmod.h"
-#include "VBoxCalls.h"
-#include "vbsfmount.h"
 
 // #define wchar_t linux_wchar_t
@@ -47 +43 @@
 #endif
 
-/* structs */
-struct sf_glob_info {
-        VBSFMAP map;
-        struct nls_table *nls;
-        int ttl;
-        int uid;
-        int gid;
-};
-
-struct sf_inode_info {
-        SHFLSTRING *path;
-        int force_restat;
-};
-
-struct sf_dir_info {
-        struct list_head info_list;
-};
-
-struct sf_dir_buf {
-        size_t nb_entries;
-        size_t free_bytes;
-        size_t used_bytes;
-        void *buf;
-        struct list_head head;
-};
-
-struct sf_reg_info {
-        SHFLHANDLE handle;
-};
-
 /* globals */
-static VBSFCLIENT client_handle;
+VBSFCLIENT client_handle;
 
 /* forward declarations */
-static struct inode_operations  sf_dir_iops;
-static struct inode_operations  sf_reg_iops;
-static struct file_operations   sf_dir_fops;
-static struct file_operations   sf_reg_fops;
 static struct super_operations  sf_super_ops;
-static struct dentry_operations sf_dentry_ops;
-
-#include "utils.c"
-#include "dirops.c"
-#include "regops.c"
+
+// #include "utils.c"
+// #include "dirops.c"
+// #include "regops.c"
 
 /* allocate global info, try to map host share */
@@ -105 +66 @@
         if (!sf_g) {
                 err = -ENOMEM;
-                elog2 ("could not allocate memory for global info\n");
+                LogRelPrintFunc("could not allocate memory for global info\n");
                 goto fail0;
         }
@@ -115 +76 @@
         if (name_len > 0xfffe) {
                 err = -ENAMETOOLONG;
-                elog2 ("map name too big\n");
+                LogFunc(("map name too big\n"));
                 goto fail1;
         }
@@ -123 +84 @@
         if (!str_name) {
                 err = -ENOMEM;
-                elog2 ("could not allocate memory for host name\n");
+                LogRelPrintFunc("could not allocate memory for host name\n");
                 goto fail1;
         }
@@ -135 +96 @@
                 if (!sf_g->nls) {
                         err = -EINVAL;
-                        elog ("failed to load nls %.*s\n",
-                              sizeof (info->nls_name), info->nls_name);
+                        LogFunc(("failed to load nls %s\n", info->nls_name));
                         goto fail1;
                 }
@@ -149 +109 @@
         if (VBOX_FAILURE (rc)) {
                 err = -EPROTO;
-                elog ("vboxCallMapFolder failed rc=%d\n", rc);
+                LogFunc(("vboxCallMapFolder failed rc=%d\n", rc));
                 goto fail2;
         }
@@ -179 +139 @@
         rc = vboxCallUnmapFolder (&client_handle, &sf_g->map);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxCallUnmapFolder failed rc=%d\n", rc);
+                LogFunc(("vboxCallUnmapFolder failed rc=%d\n", rc));
         }
 
@@ -210 +170 @@
         TRACE ();
         if (!data) {
-                elog2 ("no mount info specified\n");
+                LogFunc(("no mount info specified\n"));
                 return -EINVAL;
         }
@@ -217 +177 @@
 
         if (flags & MS_REMOUNT) {
-                elog2 ("remounting is not supported\n");
+                LogFunc(("remounting is not supported\n"));
                 return -ENOSYS;
         }
@@ -229 +189 @@
         if (!sf_i) {
                 err = -ENOMEM;
-                elog2 ("could not allocate memory for root inode info\n");
+                LogRelPrintFunc ("could not allocate memory for root inode info\n");
                 goto fail1;
         }
@@ -236 +196 @@
         if (!sf_i->path) {
                 err = -ENOMEM;
-                elog2 ("could not allocate memory for root inode path\n");
+                LogRelPrintFunc ("could not allocate memory for root inode path\n");
                 goto fail2;
         }
@@ -247 +207 @@
         err = sf_stat (__func__, sf_g, sf_i->path, &fsinfo, 0);
         if (err) {
-                elog2 ("could not stat root of share\n");
+                LogFunc(("could not stat root of share\n"));
                 goto fail3;
         }
@@ -258 +218 @@
         if (!iroot) {
                 err = -ENOMEM;  /* XXX */
-                elog2 ("could not get root inode\n");
+                LogFunc(("could not get root inode\n"));
                 goto fail3;
         }
@@ -268 +228 @@
         if (!droot) {
                 err = -ENOMEM;  /* XXX */
-                elog2 ("d_alloc_root failed\n");
+                LogFunc(("d_alloc_root failed\n"));
                 goto fail4;
         }
@@ -441 +401 @@
         err = register_filesystem (&vboxsf_fs_type);
         if (err) {
-                elog ("register_filesystem err=%d\n", err);
+                LogFunc(("register_filesystem err=%d\n", err));
                 return err;
         }
@@ -451 +411 @@
         rc = vboxInit ();
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxInit failed rc=%d\n", rc);
+                LogRelPrintFunc ("vboxInit failed\n");
+                Log (("rc=%d\n", rc));
                 goto fail0;
         }
@@ -457 +418 @@
         rc = vboxConnect (&client_handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxConnect failed rc=%d\n", rc);
+                LogRelPrintFunc ("vboxConnect failed\n");
+                Log (("rc=%d\n", rc));
                 goto fail1;
         }
@@ -463 +425 @@
         rc = vboxCallSetUtf8 (&client_handle);
         if (VBOX_FAILURE (rc)) {
-                elog ("vboxCallSetUtf8 failed rc=%d\n", rc);
+                LogRelPrintFunc ("vboxCallSetUtf8 failed\n");
+                Log (("rc=%d\n", rc));
                 goto fail2;
         }
@@ -496 +459 @@
 int __gxx_personality_v0 = 0xdeadbeef;
 
+#if 0
 /* long long hacks (as far as i can see, gcc emits the refs to those
    symbols, notwithstanding the fact that those aren't referenced
@@ -510 +474 @@
         BUG ();
 }
+#endif /* 0 */
 
 /*

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

@@ -19 +19 @@
 #define VFSMOD_H
 
-#define elog(fmt, ...) \
-printk (KERN_ERR "vboxvfs: %s: " fmt, __func__, __VA_ARGS__)
-#define elog2(s) printk (KERN_ERR "vboxvfs: %s: " s, __func__)
-#define elog3(...) printk (KERN_ERR "vboxvfs: " __VA_ARGS__)
+#include "the-linux-kernel.h"
+#include "version-generated.h"
+
+#include "VBoxCalls.h"
+#include "vbsfmount.h"
+
+/* structs */
+struct sf_glob_info {
+        VBSFMAP map;
+        struct nls_table *nls;
+        int ttl;
+        int uid;
+        int gid;
+};
+
+struct sf_inode_info {
+        SHFLSTRING *path;
+        int force_restat;
+};
+
+struct sf_dir_info {
+        struct list_head info_list;
+};
+
+struct sf_dir_buf {
+        size_t nb_entries;
+        size_t free_bytes;
+        size_t used_bytes;
+        void *buf;
+        struct list_head head;
+};
+
+struct sf_reg_info {
+        SHFLHANDLE handle;
+};
+
+/* globals */
+extern VBSFCLIENT client_handle;
+
+/* forward declarations */
+extern struct inode_operations  sf_dir_iops;
+extern struct inode_operations  sf_reg_iops;
+extern struct file_operations   sf_dir_fops;
+extern struct file_operations   sf_reg_fops;
+extern struct dentry_operations sf_dentry_ops;
+
+extern int
+sf_stat (const char *caller, struct sf_glob_info *sf_g,
+         SHFLSTRING *path, RTFSOBJINFO *result, int ok_to_fail);
+extern void
+sf_init_inode (struct sf_glob_info *sf_g, struct inode *inode,
+               RTFSOBJINFO *info);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+extern int
+sf_getattr (struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat);
+#endif
+extern int
+sf_path_from_dentry (const char *caller, struct sf_glob_info *sf_g,
+                     struct sf_inode_info *sf_i, struct dentry *dentry,
+                     SHFLSTRING **result);
+extern int
+sf_nlscpy (struct sf_glob_info *sf_g,
+           char *name, size_t name_bound_len,
+           const unsigned char *utf8_name, size_t utf8_len);
+extern void
+sf_dir_info_free (struct sf_dir_info *p);
+extern struct sf_dir_info *
+sf_dir_info_alloc (void);
+extern int
+sf_dir_read_all (struct sf_glob_info *sf_g, struct sf_inode_info *sf_i,
+                 struct sf_dir_info *sf_d, SHFLHANDLE handle);
 
 #ifdef ALIGN
@@ -30 +97 @@
 #define CMC_API __attribute__ ((cdecl, regparm (0)))
 
-#define DBGC if (0)
-#define TRACE() DBGC printk (KERN_DEBUG "%s\n", __func__)
+#define TRACE() LogFlow (("%s, tracepoint\n", __func__))
 
 /* Following casts are here to prevent assignment of void * to