vbox的更動 59406 路徑 trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

時間撮記:

2016-1-19 上午11:36:14 (9 年 以前)

作者:

vboxsync

訊息:

Additions/linux/sharedfolders: Linux 4.5 fix, untested

檔案:

• trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c (修改) (3 筆差異)

trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

@@ -21 +21 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *sf_follow_link(struct dentry *dentry, void **cookie)
-# else
+#  else
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
-# endif
+#  endif
 {
     struct inode *inode = dentry->d_inode;
@@ -45 +46 @@
         }
     }
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
     return error ? ERR_PTR(error) : (*cookie = path);
-# else
+#  else
     nd_set_link(nd, error ? ERR_PTR(error) : path);
     return NULL;
-# endif
+#  endif
 }
 
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+#  if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
 static void sf_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
 {
@@ -60 +61 @@
         free_page((unsigned long)page);
 }
-#endif
+#  endif
+
+# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) */
+static const char *sf_get_link(struct dentry *dentry, struct inode *inode,
+                               struct delayed_call *done)
+{
+    struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
+    struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
+    char *path;
+    int rc;
+
+    if (!dentry)
+        return ERR_PTR(-ECHILD);
+    path = kzalloc(PAGE_SIZE, GFP_KERNEL);
+    if (!path)
+        return ERR_PTR(-ENOMEM);
+    rc = VbglR0SfReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
+    if (RT_FAILURE(rc))
+    {
+        LogFunc(("VbglR0SfReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
+        kfree(path);
+        return ERR_PTR(-EPROTO);
+    }
+    set_delayed_call(done, kfree_link, path);
+    return path;
+}
+# endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) */
 
 struct inode_operations sf_lnk_iops =
 {
     .readlink       = generic_readlink,
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+    .get_link       = sf_get_link
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
     .follow_link    = sf_follow_link,
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
     .put_link       = free_page_put_link,
 # else
+    .follow_link    = sf_follow_link,
     .put_link       = sf_put_link
 # endif
 };
 
-#endif
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) */