diff -u -r vmblock-only/linux/control.c vmblock-only-patched/linux/control.c --- vmblock-only/linux/control.c 2013-02-26 19:17:29.000000000 +1100 +++ vmblock-only-patched/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; }