fold unlocking the children into dentry_unlock_parents_for_move()

Al Viro · Al Viro · commit 986c01942afb · 2014-09-26T23:11:15.000-04:00
... renaming it into dentry_unlock_for_move() and making it more
symmetric with dentry_lock_for_move().

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/dcache.c b/fs/dcache.c
@@ -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);
 }
 
 /*
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -2442,13 +2442,14 @@ static void dentry_lock_for_move(struct dentry dentry, struct dentry target)`
`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 @@ static void __d_move(struct dentry dentry, struct dentry target,`
`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`	`/*`