UBUNTU: ubuntu: vbox -- Update to 5.1.10-dfsg-2

[mirror_ubuntu-zesty-kernel.git] / ubuntu / vbox / vboxsf / dirops.c

diff --git a/ubuntu/vbox/vboxsf/dirops.c b/ubuntu/vbox/vboxsf/dirops.c
index 571f807e8ed3630be81987564a066f638d3cb1e5..0267b0b9fa63e9634f2df1a957097ed4570ffa27 100644 (file)
--- a/ubuntu/vbox/vboxsf/dirops.c
+++ b/ubuntu/vbox/vboxsf/dirops.c
@@ -745,16 +745,29 @@ static int sf_rmdir(struct inode *parent, struct dentry *dentry)
  * @param old_dentry    old directory cache entry
  * @param new_parent    inode of the new parent directory
  * @param new_dentry    new directory cache entry
+ * @param flags         flags
  * @returns 0 on success, Linux error code otherwise
  */
 static int sf_rename(struct inode *old_parent, struct dentry *old_dentry,
-                     struct inode *new_parent, struct dentry *new_dentry)
+                     struct inode *new_parent, struct dentry *new_dentry
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
+                     , unsigned flags
+#endif
+                     )
 {
     int err = 0, rc = VINF_SUCCESS;
     struct sf_glob_info *sf_g = GET_GLOB_INFO(old_parent->i_sb);
 
     TRACE();
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
+    if (flags)
+    {
+        LogFunc(("rename with flags=%x\n", flags));
+        return -EINVAL;
+    }
+#endif
+
     if (sf_g != GET_GLOB_INFO(new_parent->i_sb))
     {
         LogFunc(("rename with different roots\n"));