[patch] 304-4.5-01-inode.patch

304-4.5-01-inode.patch (text/plain), 2.29 KB, created by Ognian Tenchev on 2016-03-15 13:21:27 UTC

--- vmblock-only/linux/inode.c.orig	2016-03-15 07:44:26.498299236 +0200
+++ vmblock-only/linux/inode.c	2016-03-15 07:52:52.675311266 +0200
@@ -44,7 +44,9 @@
 static int InodeOpReadlink(struct dentry *, char __user *, int);
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+static const char *InodeOpGetlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
@@ -63,7 +65,11 @@
 struct inode_operations LinkInodeOps = {
 #endif
    .readlink    = InodeOpReadlink,
-   .follow_link = InodeOpFollowlink,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+   .get_link = InodeOpGetlink
+#else
+   .follow_link = InodeOpFollowlink
+#endif
 };
 
 /*
@@ -223,7 +229,9 @@
  *----------------------------------------------------------------------------
  */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+static const char *InodeOpGetlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void * InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
--- vmblock-only/linux/inode.c.orig	2016-03-15 12:42:57.975813212 +0200
+++ vmblock-only/linux/inode.c	2016-03-15 12:43:01.237813289 +0200
@@ -256,7 +256,9 @@
       goto out;
    }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+	return link = (char *)(iinfo->name);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
     return *cookie = (char *)(iinfo->name);
 #else
    nd_set_link(nd, iinfo->name);
--- vmblock-only/linux/inode.c.orig	2016-03-15 12:47:07.118819133 +0200
+++ vmblock-only/linux/inode.c	2016-03-15 12:47:33.443819759 +0200
@@ -243,6 +243,7 @@
 {
    int ret;
    VMBlockInodeInfo *iinfo;
+   char *link = NULL;
 
    if (!dentry) {
       Warning("InodeOpReadlink: invalid args from kernel\n");