The HAVE_PATH_IN_NAMEIDATA compat macros should have been used here.
This commit is contained in:
parent
749e5eb1ed
commit
2141116167
|
@ -304,7 +304,7 @@ vn_remove(const char *path, uio_seg_t seg, int flags)
|
||||||
#ifdef HAVE_2ARGS_VFS_UNLINK
|
#ifdef HAVE_2ARGS_VFS_UNLINK
|
||||||
rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
|
rc = vfs_unlink(nd.nd_dentry->d_inode, dentry);
|
||||||
#else
|
#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 */
|
#endif /* HAVE_2ARGS_VFS_UNLINK */
|
||||||
exit2:
|
exit2:
|
||||||
dput(dentry);
|
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,
|
rc = vfs_rename(old_dir->d_inode, old_dentry,
|
||||||
new_dir->d_inode, new_dentry);
|
new_dir->d_inode, new_dentry);
|
||||||
#else
|
#else
|
||||||
rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.mnt,
|
rc = vfs_rename(old_dir->d_inode, old_dentry, oldnd.nd_mnt,
|
||||||
new_dir->d_inode, new_dentry, newnd.mnt);
|
new_dir->d_inode, new_dentry, newnd.nd_mnt);
|
||||||
#endif /* HAVE_4ARGS_VFS_RENAME */
|
#endif /* HAVE_4ARGS_VFS_RENAME */
|
||||||
exit5:
|
exit5:
|
||||||
dput(new_dentry);
|
dput(new_dentry);
|
||||||
|
|
Loading…
Reference in New Issue