Commit 986c01942afb8eb6cc1708e721292db23b715d4e
1 parent
63cf427a57
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
fold unlocking the children into dentry_unlock_parents_for_move()
... renaming it into dentry_unlock_for_move() and making it more symmetric with dentry_lock_for_move(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 1 changed file with 4 additions and 5 deletions Side-by-side Diff
fs/dcache.c
| ... | ... | @@ -2442,13 +2442,14 @@ |
| 2442 | 2442 | } |
| 2443 | 2443 | } |
| 2444 | 2444 | |
| 2445 | -static void dentry_unlock_parents_for_move(struct dentry *dentry, | |
| 2446 | - struct dentry *target) | |
| 2445 | +static void dentry_unlock_for_move(struct dentry *dentry, struct dentry *target) | |
| 2447 | 2446 | { |
| 2448 | 2447 | if (target->d_parent != dentry->d_parent) |
| 2449 | 2448 | spin_unlock(&dentry->d_parent->d_lock); |
| 2450 | 2449 | if (target->d_parent != target) |
| 2451 | 2450 | spin_unlock(&target->d_parent->d_lock); |
| 2451 | + spin_unlock(&target->d_lock); | |
| 2452 | + spin_unlock(&dentry->d_lock); | |
| 2452 | 2453 | } |
| 2453 | 2454 | |
| 2454 | 2455 | /* |
| ... | ... | @@ -2531,9 +2532,7 @@ |
| 2531 | 2532 | write_seqcount_end(&target->d_seq); |
| 2532 | 2533 | write_seqcount_end(&dentry->d_seq); |
| 2533 | 2534 | |
| 2534 | - dentry_unlock_parents_for_move(dentry, target); | |
| 2535 | - spin_unlock(&target->d_lock); | |
| 2536 | - spin_unlock(&dentry->d_lock); | |
| 2535 | + dentry_unlock_for_move(dentry, target); | |
| 2537 | 2536 | } |
| 2538 | 2537 | |
| 2539 | 2538 | /* |