Advertisement
rzuber

279-vmblock-3.12.patch

Apr 14th, 2014
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C 2.58 KB | None | 0 0
  1. --- a/vmblock-only/linux/control.c        2013-10-03 04:29:47.471339204 -0400
  2. +++ b/vmblock-only/linux/control.c        2013-10-03 04:31:56.607334636 -0400
  3. @@ -283,7 +283,7 @@
  4.     int i;
  5.     int retval;
  6.  
  7. -   name = getname(buf);
  8. +   name = (char*)getname(buf)->name;
  9.     if (IS_ERR(name)) {
  10.        return PTR_ERR(name);
  11.     }
  12. --- a/vmblock-only/linux/dentry.c        2013-10-03 04:29:47.471339204 -0400
  13. +++ b/vmblock-only/linux/dentry.c        2013-10-03 04:31:56.607334636 -0400
  14. @@ -32,7 +32,7 @@
  15.  #include "block.h"
  16.  
  17.  
  18. -static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
  19. +static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
  20.  
  21.  struct dentry_operations LinkDentryOps = {
  22.     .d_revalidate = DentryOpRevalidate,
  23. @@ -60,7 +60,7 @@
  24.  
  25.  static int
  26.  DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
  27. -                   struct nameidata *nd)   // IN: lookup flags & intent
  28. +                   unsigned int flags)     // IN: lookup flags & intent
  29.  {
  30.     VMBlockInodeInfo *iinfo;
  31.     struct nameidata actualNd;
  32. @@ -101,7 +101,7 @@
  33.     if (actualDentry &&
  34.         actualDentry->d_op &&
  35.         actualDentry->d_op->d_revalidate) {
  36. -      return actualDentry->d_op->d_revalidate(actualDentry, nd);
  37. +      return actualDentry->d_op->d_revalidate(actualDentry, flags);
  38.     }
  39.  
  40.     if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
  41. --- a/vmblock-only/linux/inode.c        2013-10-03 04:29:47.471339204 -0400
  42. +++ b/vmblock-only/linux/inode.c        2013-10-03 04:31:56.607334636 -0400
  43. @@ -36,7 +36,7 @@
  44.  
  45.  /* Inode operations */
  46.  static struct dentry *InodeOpLookup(struct inode *dir,
  47. -                                    struct dentry *dentry, struct nameidata *nd);
  48. +                                    struct dentry *dentry, unsigned int flags);
  49.  static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
  50.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
  51.  static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
  52. @@ -75,7 +75,7 @@
  53.  static struct dentry *
  54.  InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
  55.                struct dentry *dentry,  // IN: dentry to lookup
  56. -              struct nameidata *nd)   // IN: lookup intent and information
  57. +              unsigned int flags)     // IN: lookup intent and information
  58.  {
  59.     char *filename;
  60.     struct inode *inode;
  61. @@ -221,7 +221,7 @@
  62.        goto out;
  63.     }
  64.  
  65. -   ret = vfs_follow_link(nd, iinfo->name);
  66. +   nd_set_link(nd, iinfo->name);
  67.  
  68.  out:
  69.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement