mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-07 13:43:51 +00:00
__d_unalias() doesn't use inode argument
... and hasn't since 2015. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
f9f677c5f7
commit
ef69f0506d
@ -3045,8 +3045,7 @@ struct dentry *d_ancestor(struct dentry *p1, struct dentry *p2)
|
|||||||
* Note: If ever the locking in lock_rename() changes, then please
|
* Note: If ever the locking in lock_rename() changes, then please
|
||||||
* remember to update this too...
|
* remember to update this too...
|
||||||
*/
|
*/
|
||||||
static int __d_unalias(struct inode *inode,
|
static int __d_unalias(struct dentry *dentry, struct dentry *alias)
|
||||||
struct dentry *dentry, struct dentry *alias)
|
|
||||||
{
|
{
|
||||||
struct mutex *m1 = NULL;
|
struct mutex *m1 = NULL;
|
||||||
struct rw_semaphore *m2 = NULL;
|
struct rw_semaphore *m2 = NULL;
|
||||||
@ -3127,7 +3126,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
|
|||||||
inode->i_sb->s_id);
|
inode->i_sb->s_id);
|
||||||
} else if (!IS_ROOT(new)) {
|
} else if (!IS_ROOT(new)) {
|
||||||
struct dentry *old_parent = dget(new->d_parent);
|
struct dentry *old_parent = dget(new->d_parent);
|
||||||
int err = __d_unalias(inode, dentry, new);
|
int err = __d_unalias(dentry, new);
|
||||||
write_sequnlock(&rename_lock);
|
write_sequnlock(&rename_lock);
|
||||||
if (err) {
|
if (err) {
|
||||||
dput(new);
|
dput(new);
|
||||||
|
Loading…
Reference in New Issue
Block a user