Skip to content

Commit

Permalink
fold unlocking the children into dentry_unlock_parents_for_move()
Browse files Browse the repository at this point in the history 
... renaming it into dentry_unlock_for_move() and making it more
symmetric with dentry_lock_for_move().

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Sep 27, 2014
1 parent 63cf427 commit 986c019
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/dcache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2442,13 +2442,14 @@ static void dentry_lock_for_move(struct dentry *dentry, struct dentry *target)
}
}

static void dentry_unlock_parents_for_move(struct dentry *dentry,
struct dentry *target)
static void dentry_unlock_for_move(struct dentry *dentry, struct dentry *target)
{
if (target->d_parent != dentry->d_parent)
spin_unlock(&dentry->d_parent->d_lock);
if (target->d_parent != target)
spin_unlock(&target->d_parent->d_lock);
spin_unlock(&target->d_lock);
spin_unlock(&dentry->d_lock);
}

/*
Expand Down Expand Up @@ -2531,9 +2532,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target,
write_seqcount_end(&target->d_seq);
write_seqcount_end(&dentry->d_seq);

dentry_unlock_parents_for_move(dentry, target);
spin_unlock(&target->d_lock);
spin_unlock(&dentry->d_lock);
dentry_unlock_for_move(dentry, target);
}

/*
Expand Down

0 comments on commit 986c019

Please sign in to comment.