Changeset 28998 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

May 4, 2010 9:44:57 AM (15 years ago)

Author:

vboxsync

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

61029

Message:

Linux Additions: rename the vboxvfs module to vboxsf to make it load by demand of the Linux kernel

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• export_modules (modified) (3 diffs)
• installer/Makefile.include.footer (modified) (1 diff)
• installer/Makefile.include.header (modified) (1 diff)
• installer/vboxadd.sh (modified) (9 diffs)
• sharedfolders/Makefile.kmk (modified) (4 diffs)
• sharedfolders/Makefile.module (modified) (2 diffs)
• sharedfolders/dirops.c (modified) (1 diff)
• sharedfolders/dkms.conf (modified) (1 diff)
• sharedfolders/files_vboxsf (moved) (moved from trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs ) (2 diffs)
• sharedfolders/mount.vboxsf.c (modified) (1 diff)
• sharedfolders/regops.c (modified) (1 diff)
• sharedfolders/utils.c (modified) (2 diffs)
• sharedfolders/vbsfmount.h (modified) (1 diff)
• sharedfolders/vfsmod.c (modified) (2 diffs)
• sharedfolders/vfsmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/Makefile ¶

@@ -27 +27 @@
          fi
         @echo
-        @if [ -d vboxvfs ]; then \
+        @if [ -d vboxsf ]; then \
             if [ -f vboxguest/Module.symvers ]; then \
-                cp vboxguest/Module.symvers vboxvfs; \
+                cp vboxguest/Module.symvers vboxsf; \
             fi; \
-            echo "*** Building 'vboxvfs' module ***"; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs; \
-            if [ -f vboxvfs/vboxvfs.ko ]; then \
-                cp vboxvfs/vboxvfs.ko .; \
+            echo "*** Building 'vboxsf' module ***"; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf; \
+            if [ -f vboxsf/vboxsf.ko ]; then \
+                cp vboxsf/vboxsf.ko .; \
             else \
-                cp vboxvfs/vboxvfs.o .; \
+                cp vboxsf/vboxsf.o .; \
             fi; \
         fi
@@ -43 +43 @@
 install:
         @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
-        @if [ -d vboxvfs ]; then \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
+        @if [ -d vboxsf ]; then \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf install; \
         fi
 
 clean:
         @$(MAKE) -C vboxguest clean
-        @if [ -d vboxvfs ]; then \
-            $(MAKE) -C vboxvfs clean; \
+        @if [ -d vboxsf ]; then \
+            $(MAKE) -C vboxsf clean; \
         fi
-        rm -f vboxguest.*o vboxvfs.*o
+        rm -f vboxguest.*o vboxsf.*o
 
 load:
-        @/sbin/rmmod vboxvfs || true
+        @/sbin/rmmod vboxsf || true
         @/sbin/rmmod vboxguest || true
         @/sbin/insmod vboxguest.ko
-        @if [ -f vboxvfs.ko ]; then /sbin/insmod vboxvfs.ko; fi
+        @if [ -f vboxsf.ko ]; then /sbin/insmod vboxsf.ko; fi

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

@@ -146 +146 @@
 
 VBOX_ADD_KMOD.linux = \
-        vboxvfs \
+        vboxsf \
         vboxvideo
 

trunk/src/VBox/Additions/linux/export_modules ¶

@@ -27 +27 @@
 PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
 PATH_VBOXGUEST="$PATH_ROOT/src/VBox/Additions/common/VBoxGuest"
-PATH_VBOXVFS="$PATH_ROOT/src/VBox/Additions/linux/sharedfolders"
+PATH_VBOXSF="$PATH_ROOT/src/VBox/Additions/linux/sharedfolders"
 
 VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
@@ -34 +34 @@
 
 . $PATH_VBOXGUEST/linux/files_vboxguest
-. $PATH_VBOXVFS/files_vboxvfs
+. $PATH_VBOXSF/files_vboxsf
 
 # Temporary path for creating the modules, will be removed later
@@ -59 +59 @@
 done
 
-# vboxvfs (VirtualBox guest kernel module for shared folders)
-mkdir $PATH_TMP/vboxvfs || exit 1
-for f in $FILES_VBOXVFS_NOBIN; do
-    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxvfs/`echo $f|cut -d'>' -f2`"
+# vboxsf (VirtualBox guest kernel module for shared folders)
+mkdir $PATH_TMP/vboxsf || exit 1
+for f in $FILES_VBOXSF_NOBIN; do
+    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxsf/`echo $f|cut -d'>' -f2`"
 done
-for f in $FILES_VBOXVFS_BIN; do
-    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxvfs/`echo $f|cut -d'>' -f2`"
+for f in $FILES_VBOXSF_BIN; do
+    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxsf/`echo $f|cut -d'>' -f2`"
 done
 

trunk/src/VBox/Additions/linux/installer/Makefile.include.footer ¶

@@ -50 +50 @@
 # 
 ## important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
-#       rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Modules.symvers modules.order
+#       rm -rf .vboxsf* .tmp_ver* vboxsf.* Modules.symvers modules.order
 # 
 

trunk/src/VBox/Additions/linux/installer/Makefile.include.header ¶

@@ -54 +54 @@
 # 
 ## important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
-#       rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Modules.symvers modules.order
+#       rm -rf .vboxsf* .tmp_ver* vboxsf.* Modules.symvers modules.order
 # 
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh ¶

@@ -32 +32 @@
 PACKAGE=VBoxGuestAdditions
 BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXVFS=`/bin/ls /usr/src/vboxvfs*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
+BUILDVBOXSF=`/bin/ls /usr/src/vboxsf*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxvideo*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 LOG="/var/log/vboxadd-install.log"
@@ -189 +189 @@
 }
 
-running_vboxvfs()
-{
-    lsmod | grep -q "vboxvfs[^_-]"
+running_vboxsf()
+{
+    lsmod | grep -q "vboxsf[^_-]"
 }
 
@@ -256 +256 @@
     fi
 
-    if [ -n "$BUILDVBOXVFS" ]; then
-        running_vboxvfs || {
-            $MODPROBE vboxvfs > /dev/null 2>&1 || {
+    if [ -n "$BUILDVBOXSF" ]; then
+        running_vboxsf || {
+            $MODPROBE vboxsf > /dev/null 2>&1 || {
                 if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
                     fail_msg
@@ -265 +265 @@
                     exit 1
                 fi
-                fail "modprobe vboxvfs failed"
+                fail "modprobe vboxsf failed"
             }
         }
@@ -284 +284 @@
         fail "Cannot unmount vboxsf folders"
     fi
-    if [ -n "$BUILDVBOXVFS" ]; then
-        if running_vboxvfs; then
-            rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
+    if [ -n "$BUILDVBOXSF" ]; then
+        if running_vboxsf; then
+            rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf"
         fi
     fi
@@ -313 +313 @@
         succ_msg
     fi
-    if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
-        begin "Removing old VirtualBox vboxvfs kernel module"
-        find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+    if find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then
+        begin "Removing old VirtualBox vboxsf kernel module"
+        find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|xargs rm -f 2>/dev/null
         succ_msg
     fi
@@ -341 +341 @@
     fi
     succ_msg
-    if [ -n "$BUILDVBOXVFS" ]; then
+    if [ -n "$BUILDVBOXSF" ]; then
         begin "Building the shared folder support module"
-        if ! $BUILDVBOXVFS \
+        if ! $BUILDVBOXSF \
             --use-module-symvers /tmp/vboxguest-Module.symvers \
             --no-print-directory install >> $LOG 2>&1; then
@@ -416 +416 @@
     if [ -n "$DKMS" ]; then
       echo "Attempt to remove old DKMS modules..."
-      for mod in vboxadd vboxguest vboxvfs vboxvideo; do
+      for mod in vboxadd vboxguest vboxvfs vboxsf vboxvideo; do
         $DKMS status -m $mod | while read line; do
           if echo "$line" | grep -q added > /dev/null ||
@@ -434 +434 @@
     find /lib/modules -name vboxguest\* | xargs rm 2>/dev/null
     find /lib/modules -name vboxvfs\* | xargs rm 2>/dev/null
+    find /lib/modules -name vboxsf\* | xargs rm 2>/dev/null
     find /lib/modules -name vboxvideo\* | xargs rm 2>/dev/null
     depmod
 
     # Remove old module sources
-    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxvideo-*
+    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxsf-* /usr/src/vboxvideo-*
 
     # Remove other files

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

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-Makefile for the vboxvfs (linux shared folders module).
+# Sub-Makefile for the vboxsf (linux shared folders module).
 #
 
@@ -20 +20 @@
 
 PROGRAMS += mount.vboxsf
-INSTALLS += vboxvfs-mod vboxvfs-sh
+INSTALLS += vboxsf-mod vboxsf-sh
 ifdef VBOX_WITH_ADDITION_DRIVERS
- SYSMODS += vboxvfs
+ SYSMODS += vboxsf
 endif
 
 #
-# Populate FILES_VBOXVFS_NOBIN
+# Populate FILES_VBOXSF_NOBIN
 #
-include $(PATH_SUB_CURRENT)/files_vboxvfs
+include $(PATH_SUB_CURRENT)/files_vboxsf
 
-vboxvfs-mod_INST        = $(INST_ADDITIONS)src/vboxvfs/
-vboxvfs-mod_MODE        = a+r,u+w
-vboxvfs-mod_SOURCES     = $(subst ",,$(FILES_VBOXVFS_NOBIN))
-vboxvfs-mod_SOURCES    += $(if $(VBOX_OSE),,\
-                            $(PATH_vboxvfs-mod)/dkms.conf)
-vboxvfs-mod_CLEAN      += $(PATH_vboxvfs-mod)/dkms.conf
+vboxsf-mod_INST        = $(INST_ADDITIONS)src/vboxsf/
+vboxsf-mod_MODE        = a+r,u+w
+vboxsf-mod_SOURCES     = $(subst ",,$(FILES_VBOXSF_NOBIN))
+vboxsf-mod_SOURCES    += $(if $(VBOX_OSE),,\
+                            $(PATH_vboxsf-mod)/dkms.conf)
+vboxsf-mod_CLEAN      += $(PATH_vboxsf-mod)/dkms.conf
 
-vboxvfs-sh_INST        = $(INST_ADDITIONS)src/vboxvfs/
-vboxvfs-sh_MODE        = a+rx,u+w
-vboxvfs-sh_SOURCES     = $(subst ",,$(FILES_VBOXVFS_BIN))
-vboxvfs-sh_SOURCES    += \
-        $(PATH_vboxvfs-sh)/build_in_tmp \
+vboxsf-sh_INST        = $(INST_ADDITIONS)src/vboxsf/
+vboxsf-sh_MODE        = a+rx,u+w
+vboxsf-sh_SOURCES     = $(subst ",,$(FILES_VBOXSF_BIN))
+vboxsf-sh_SOURCES    += \
+        $(PATH_vboxsf-sh)/build_in_tmp \
         $(if $(VBOX_OSE),,\
           $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
-vboxvfs-sh_CLEAN      += $(PATH_vboxvfs-sh)/build_in_tmp
+vboxsf-sh_CLEAN      += $(PATH_vboxsf-sh)/build_in_tmp
 
 
@@ -51 +51 @@
 # The DEBUG_HASH* stuff is for CONFIG_DYNAMIC_DEBUG-enabled kernels
 #
-vboxvfs_TEMPLATE        = VBOXGUESTR0
-vboxvfs_NOINST          = 1
-vboxvfs_CFLAGS          = -fshort-wchar
-vboxvfs_DEFS            = \
+vboxsf_TEMPLATE        = VBOXGUESTR0
+vboxsf_NOINST          = 1
+vboxsf_CFLAGS          = -fshort-wchar
+vboxsf_DEFS            = \
         MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
-        KBUILD_MODNAME=KBUILD_STR\(vboxvfs\) \
-        KBUILD_BASENAME=KBUILD_STR\(vboxvfs\) \
+        KBUILD_MODNAME=KBUILD_STR\(vboxsf\) \
+        KBUILD_BASENAME=KBUILD_STR\(vboxsf\) \
         DEBUG_HASH=2 DEBUG_HASH2=3
-vboxvfs_INCS            = \
+vboxsf_INCS            = \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
         $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
-vboxvfs_SOURCES         = \
+vboxsf_SOURCES         = \
         vfsmod.c \
         utils.c \
         dirops.c \
         regops.c
-vboxvfs_LIBS            = \
+vboxsf_LIBS            = \
         $(VBOX_LIB_VBGL_R0)
 
 # detect fc6 2.6.18
-vboxvfs_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
+vboxsf_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
                             $(if $(wildcard $(inc)/linux/utsrelease.h),\
                               $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
                                 then echo yes; fi),KERNEL_FC6,),))
 # detect rhel5 2.6.18
-vboxvfs_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
+vboxsf_DEFS           += $(foreach inc,$(VBOX_LINUX_INCS),\
                             $(if $(wildcard $(inc)/linux/utsrelease.h),\
                               $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
@@ -93 +93 @@
 ## Scripts needed for building kernel modules
 
-$$(PATH_vboxvfs-sh)/build_in_tmp: \
+$$(PATH_vboxsf-sh)/build_in_tmp: \
                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
                 $(VBOX_VERSION_STAMP) \
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvfs;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxsf;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
         $(QUIET)chmod 0755 $@
 
-$$(PATH_vboxvfs-mod)/dkms.conf: \
+$$(PATH_vboxsf-mod)/dkms.conf: \
                 $(PATH_SUB_CURRENT)/dkms.conf \
                 $(VBOX_VERSION_STAMP) \

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

@@ -59 +59 @@
 
 # override is required by the Debian guys
-override MODULE = vboxvfs
+override MODULE = vboxsf
 OBJS   = \
         vfsmod.o \
@@ -257 +257 @@
 clean:
         for f in . linux r0drv r0drv/linux; do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
-        rm -rf .vboxvfs* .tmp_ver* vboxvfs.* Modules.symvers modules.order
+        rm -rf .vboxsf* .tmp_ver* vboxsf.* Modules.symvers modules.order

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

@@ -1 +1 @@
 /** @file
  *
- * vboxvfs -- VirtualBox Guest Additions for Linux:
+ * vboxsf -- VirtualBox Guest Additions for Linux:
  * Directory inode and file operations
  */

trunk/src/VBox/Additions/linux/sharedfolders/dkms.conf ¶

@@ -1 @@
-BUILT_MODULE_NAME=vboxvfs
+BUILT_MODULE_NAME=vboxsf
 DEST_MODULE_LOCATION=/kernel/misc
-PACKAGE_NAME=vboxvfs
+PACKAGE_NAME=vboxsf
 PACKAGE_VERSION=_VERSION_
 AUTOINSTALL=yes

trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf ¶

@@ -16 +16 @@
 #
 
-FILES_VBOXVFS_NOBIN=" \
+FILES_VBOXSF_NOBIN=" \
     ${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
     ${PATH_ROOT}/include/iprt/alloc.h=>include/iprt/alloc.h \
@@ -77 +77 @@
 "
 
-FILES_VBOXVFS_BIN=" \
+FILES_VBOXSF_BIN=" \
 "

trunk/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ¶

@@ -1 +1 @@
 /** @file
- * vboxvfs -- VirtualBox Guest Additions for Linux: mount(8) helper
+ * vboxsf -- VirtualBox Guest Additions for Linux: mount(8) helper
  *
  * Parses options provided by mount (or user directly)

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

@@ -1 +1 @@
 /** @file
  *
- * vboxvfs -- VirtualBox Guest Additions for Linux:
+ * vboxsf -- VirtualBox Guest Additions for Linux:
  * Regular file inode and file operations
  */

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

@@ -1 +1 @@
 /** @file
  *
- * vboxvfs -- VirtualBox Guest Additions for Linux:
+ * vboxsf -- VirtualBox Guest Additions for Linux:
  * Utility functions.
  * Mainly conversion from/to VirtualBox/Linux data structures
@@ -813 +813 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 26)
     if (!rc)
-        rc = bdi_register(&sf_g->bdi, NULL, "vboxvfs-%s", name);
+        rc = bdi_register(&sf_g->bdi, NULL, "vboxsf-%s", name);
 #  endif /* >= 2.6.26 */
 # endif /* >= 2.6.24 */

trunk/src/VBox/Additions/linux/sharedfolders/vbsfmount.h ¶

@@ -1 +1 @@
 /** @file
- * vboxvfs -- VirtualBox Guest Additions for Linux: mount(2) parameter structure.
+ * vboxsf -- VirtualBox Guest Additions for Linux: mount(2) parameter structure.
  */
 

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

@@ -1 +1 @@
 /** @file
  *
- * vboxvfs -- VirtualBox Guest Additions for Linux:
+ * vboxsf -- VirtualBox Guest Additions for Linux:
  * Virtual File System for VirtualBox Shared Folders
  *
@@ -502 +502 @@
 
         printk(KERN_DEBUG
-               "vboxvfs: Successfully loaded version " VBOX_VERSION_STRING
+               "vboxsf: Successfully loaded version " VBOX_VERSION_STRING
                " (interface " RT_XSTR(VMMDEV_VERSION) ")\n");
 

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

@@ -1 +1 @@
 /** @file
  *
- * vboxvfs -- VirtualBox Guest Additions for Linux
+ * vboxsf -- VirtualBox Guest Additions for Linux
  */