vmblock patch for linux 3.10 (vmware 9)

After upgrading to linux 3.10, vmware workstation will have trouble compiling the vmnet and vmblock kernel modules against the latest kernel headers. This is attributed to the removal of create_proc_entry() in favor of proc_create().

  CC [M]  /tmp/modconfig-lEXylP/vmnet-only/driver.o
  CC [M]  /tmp/modconfig-lEXylP/vmnet-only/hub.o
  CC [M]  /tmp/modconfig-lEXylP/vmnet-only/userif.o
  CC [M]  /tmp/modconfig-lEXylP/vmnet-only/netif.o
/tmp/modconfig-lEXylP/vmnet-only/userif.c: In function ‘VNetUserIf_Create’:
/tmp/modconfig-lEXylP/vmnet-only/userif.c:1049:34: error: dereferencing pointer to incomplete type
/tmp/modconfig-lEXylP/vmnet-only/userif.c:1050:34: error: dereferencing pointer to incomplete type
/tmp/modconfig-lEXylP/vmnet-only/hub.c: In function ‘VNetHubAlloc’:
/tmp/modconfig-lEXylP/vmnet-only/hub.c:366:28: error: dereferencing pointer to incomplete type
/tmp/modconfig-lEXylP/vmnet-only/hub.c:367:28: error: dereferencing pointer to incomplete type
make[2]: *** [/tmp/modconfig-lEXylP/vmnet-only/userif.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: *** [/tmp/modconfig-lEXylP/vmnet-only/hub.o] Error 1
/tmp/modconfig-lEXylP/vmnet-only/netif.c: In function ‘VNetNetIf_Create’:
/tmp/modconfig-lEXylP/vmnet-only/netif.c:191:33: error: dereferencing pointer to incomplete type
/tmp/modconfig-lEXylP/vmnet-only/netif.c:192:33: error: dereferencing pointer to incomplete type
make[2]: *** [/tmp/modconfig-lEXylP/vmnet-only/netif.o] Error 1
make[1]: *** [_module_/tmp/modconfig-lEXylP/vmnet-only] Error 2
make[1]: Leaving directory `/home/ricky/kernel_src/linux-3.10'
make: *** [vmnet.ko] Error 2
make: Leaving directory `/tmp/modconfig-lEXylP/vmnet-only'
Using 2.6.x kernel build system.
make: Entering directory `/tmp/modconfig-lEXylP/vmblock-only'
/usr/bin/make -C /lib/modules/3.10.0-custom/build/include/.. SUBDIRS=$PWD SRCROOT=$PWD/. \
          MODULEBUILDDIR= modules
make[1]: Entering directory `/home/ricky/kernel_src/linux-3.10'
  CC [M]  /tmp/modconfig-lEXylP/vmblock-only/linux/block.o
  CC [M]  /tmp/modconfig-lEXylP/vmblock-only/linux/control.o
  CC [M]  /tmp/modconfig-lEXylP/vmblock-only/linux/dentry.o
  CC [M]  /tmp/modconfig-lEXylP/vmblock-only/linux/file.o
/tmp/modconfig-lEXylP/vmblock-only/linux/dentry.c:38:4: warning: initialization from incompatible pointer type [enabled by default]
/tmp/modconfig-lEXylP/vmblock-only/linux/dentry.c:38:4: warning: (near initialization for ‘LinkDentryOps.d_revalidate’) [enabled by default]
/tmp/modconfig-lEXylP/vmblock-only/linux/dentry.c: In function ‘DentryOpRevalidate’:
/tmp/modconfig-lEXylP/vmblock-only/linux/dentry.c:104:7: warning: passing argument 2 of ‘actualDentry->d_op->d_revalidate’ makes integer from pointer without a cast [enabled by default]
/tmp/modconfig-lEXylP/vmblock-only/linux/dentry.c:104:7: note: expected ‘unsigned int’ but argument is of type ‘struct nameidata *’
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c: In function ‘SetupProcDevice’:
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c:211:4: error: implicit declaration of function ‘create_proc_entry’ [-Werror=implicit-function-declaration]
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c:211:21: warning: assignment makes pointer from integer without a cast [enabled by default]
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c:221:20: error: dereferencing pointer to incomplete type
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c: In function ‘ExecuteBlockOp’:
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c:285:9: warning: assignment from incompatible pointer type [enabled by default]
/tmp/modconfig-lEXylP/vmblock-only/linux/control.c:296:4: warning: passing argument 1 of ‘putname’ from incompatible pointer type [enabled by default]
In file included from include/linux/proc_fs.h:8:0,
                 from /tmp/modconfig-lEXylP/vmblock-only/linux/control.c:28:
include/linux/fs.h:2042:13: note: expected ‘struct filename *’ but argument is of type ‘char *’
cc1: some warnings being treated as errors
make[2]: *** [/tmp/modconfig-lEXylP/vmblock-only/linux/control.o] Error 1
make[2]: *** Waiting for unfinished jobs....

Someone else has already written the patch for vmnet. You can find the patch here. On the other hand, the fix for vmblock is actually pretty simple. In case anyone needs it, here's a patch I've written.

Download: vmblock.3.10.patch

diff -r -u a/linux/control.c b/linux/control.c
--- a/linux/control.c 2013-02-26 19:17:29.000000000 +1100
+++ b/linux/control.c 2013-07-02 16:09:10.000000000 +1000
@@ -208,17 +208,18 @@
    VMBlockSetProcEntryOwner(controlProcMountpoint);
 
    /* Create /proc/fs/vmblock/dev */
-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+   /*controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
                                         VMBLOCK_CONTROL_MODE,
-                                        controlProcDirEntry);
-   if (!controlProcEntry) {
+                                        controlProcDirEntry);*/
+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps);
+   if (controlProcEntry == NULL) {
       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
       remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL);
       return -EINVAL;
    }
 
-   controlProcEntry->proc_fops = &ControlFileOps;
+   /* controlProcEntry->proc_fops = &ControlFileOps; */
    return 0;
 }
 
@@ -293,7 +294,7 @@
 
    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
 
-   putname(name);
+   __putname(name);
 
    return retval;
 }

Extract both tarballs (/usr/lib/vmware/modules/source/vmnet.tar and /usr/lib/vmware/modules/source/vmblock.tar) and apply the patches accordingly. Then, convert them back to tarballs before replacing the existing ones (you might want to make a backup just in case). Run the following and everything should now compile properly.:

sudo vmware-modconfig --console --install-all