app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-2.patch

   1 --- vmblock-only/linux/filesystem.c     2008-08-08 15:27:46.000000000 +0200
   2 +++ vmblock-only/linux/filesystem.c     2008-08-08 18:34:57.000000000 +0200
   3 @@ -64,7 +64,11 @@ static char const *fsRoot;
   4  static size_t fsRootLen;
   5  static struct file_system_type fsType = {
   6     .owner = THIS_MODULE,
   7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
   8     .name = VMBLOCK_FS_NAME,
   9 +#else
  10 +   .name = VMBLOCK_FS_NAME_I,
  11 +#endif
  12  #if KERNEL_25_FS
  13     .get_sb = FsOpGetSb,
  14     .kill_sb = kill_anon_super,
  15 @@ -506,8 +510,11 @@ FsOpReadSuper(struct super_block *sb, //
  16     rootInode->i_op = &RootInodeOps;
  17     rootInode->i_fop = &RootFileOps;
  18     rootInode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
  19 -
  20 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  21     LOG(4, "%s file system mounted\n", VMBLOCK_FS_NAME);
  22 +#else
  23 +   LOG(4, "%s file system mounted\n", VMBLOCK_FS_NAME_I);
  24 +#endif
  25     return 0;
  26  }
  27
  28 --- vmblock-only/include/vmblock.h      2008-08-08 15:27:46.000000000 +0200
  29 +++ vmblock-only/include/vmblock.h      2008-08-08 18:37:45.000000000 +0200
  30 @@ -22,7 +22,8 @@
  31  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  32  # define VMBLOCK_FS_NAME                "vmblock"
  33  #else
  34 -# define VMBLOCK_FS_NAME                "fs/vmblock"
  35 +# define VMBLOCK_FS_NAME_I              "vmblock"
  36 +# define VMBLOCK_FS_NAME                "fs/" VMBLOCK_FS_NAME_I
  37  #endif
  38  /* Commands for the control half of vmblock driver */
  39  #if defined(linux)
  40 @@ -53,7 +54,11 @@
  41  # ifdef VMX86_DEVEL
  42  #  define VMBLOCK_LIST_FILEBLOCKS       _IO('v', 3)
  43  # endif
  44 -# define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME
  45 +# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  46 +#   define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME
  47 +# else
  48 +#   define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME_I
  49 +#endif
  50  # define VMBLOCK_DEVICE                 VMBLOCK_MOUNT_POINT
  51  # define VMBLOCK_DEVICE_MODE            O_RDONLY
  52  # define VMBLOCK_CONTROL(fd, op, path)  ioctl(fd, op, path)