Imported Upstream version 0.6.3+git20140731

[mirror_spl-debian.git] / module / spl / spl-vnode.c

diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
index 549606770fa140b0bd534ed365e1a1e7cb096a43..fa3e49054fd301b312438ffee743398841cb2ed5 100644 (file)
--- a/module/spl/spl-vnode.c
+++ b/module/spl/spl-vnode.c
@@ -414,13 +414,16 @@ vn_rename(const char *oldname, const char *newname, int x1)
                        SGOTO(exit4, rc);
        }
 
-#ifdef HAVE_4ARGS_VFS_RENAME
+#if defined(HAVE_4ARGS_VFS_RENAME)
        rc = vfs_rename(old_dir->d_inode, old_dentry,
            new_dir->d_inode, new_dentry);
-#else
+#elif defined(HAVE_5ARGS_VFS_RENAME)
        rc = vfs_rename(old_dir->d_inode, old_dentry,
            new_dir->d_inode, new_dentry, NULL);
-#endif /* HAVE_4ARGS_VFS_RENAME */
+#else
+       rc = vfs_rename(old_dir->d_inode, old_dentry,
+           new_dir->d_inode, new_dentry, NULL, 0);
+#endif
 exit4:
        unlock_rename(new_dir, old_dir);
 exit3:
@@ -574,13 +577,16 @@ vn_rename(const char *oldname, const char *newname, int x1)
         if (new_dentry == trap)
                 SGOTO(exit5, rc);
 
-#ifdef HAVE_4ARGS_VFS_RENAME
+#if defined(HAVE_4ARGS_VFS_RENAME)
        rc = vfs_rename(old_dir->d_inode, old_dentry,
            new_dir->d_inode, new_dentry);
-#else
+#elif defined(HAVE_5ARGS_VFS_RENAME)
        rc = vfs_rename(old_dir->d_inode, old_dentry,
            new_dir->d_inode, new_dentry, NULL);
-#endif /* HAVE_4ARGS_VFS_RENAME */
+#else
+       rc = vfs_rename(old_dir->d_inode, old_dentry,
+           new_dir->d_inode, new_dentry, NULL, 0);
+#endif
 exit5:
         dput(new_dentry);
 exit4: