The HAVE_PATH_IN_NAMEIDATA compat macros should have been used here.

diff --git a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
index c5595dee0b45c98cc55bd3f8d091556e07b85299..08c339a5a5c04d9bcfb4f66c33ca90febf1617ca 100644 (file)
--- a/module/spl/spl-vnode.c
+++ b/module/spl/spl-vnode.c
@@ -304,7 +304,7 @@ vn_remove(const char *path, uio_seg_t seg, int flags)
 #ifdef HAVE_2ARGS_VFS_UNLINK
                 rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
 #else
-                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.mnt);
+                rc = vfs_unlink(nd.nd_dentry->d_inode, dentry, nd.nd_mnt);
 #endif /* HAVE_2ARGS_VFS_UNLINK */
 exit2:
                 dput(dentry);
@@ -401,8 +401,8 @@ vn_rename(const char *oldname, const char *newname, int x1)
         rc = vfs_rename(old_dir->d_inode, old_dentry,
                         new_dir->d_inode, new_dentry);
 #else
-        rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.mnt,
-                        new_dir->d_inode, new_dentry, newnd.mnt);
+        rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
+                        new_dir->d_inode, new_dentry, newnd.nd_mnt);
 #endif /* HAVE_4ARGS_VFS_RENAME */
 exit5:
         dput(new_dentry);