mm, swap: improve readability via make spin_lock/unlock balanced

yhuang-intel · torvalds · commit 0ef017d117d7 · 2017-05-03T15:52:10.000-07:00
This is just a cleanup patch, no functionality change. In cluster_list_add_tail(), spin_lock_nested() is used to lock the cluster, while unlock_cluster() is used to unlock the cluster. To improve the code readability, use spin_unlock() directly to unlock the cluster. Link: http://lkml.kernel.org/r/20170317064635.12792-2-ying.huang@intel.com Signed-off-by: "Huang, Ying" <ying.huang@intel.com> Acked-by: Tim Chen <tim.c.chen@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/swapfile.c b/mm/swapfile.c
@@ -335,7 +335,7 @@ static void cluster_list_add_tail(struct swap_cluster_list *list,
 		ci_tail = ci + tail;
 		spin_lock_nested(&ci_tail->lock, SINGLE_DEPTH_NESTING);
 		cluster_set_next(ci_tail, idx);
-		unlock_cluster(ci_tail);
+		spin_unlock(&ci_tail->lock);
 		cluster_set_next_flag(&list->tail, idx, 0);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ static void cluster_list_add_tail(struct swap_cluster_list *list,`
`335`	`335`	`ci_tail = ci + tail;`
`336`	`336`	`spin_lock_nested(&ci_tail->lock, SINGLE_DEPTH_NESTING);`
`337`	`337`	`cluster_set_next(ci_tail, idx);`
`338`		`- unlock_cluster(ci_tail);`
	`338`	`+ spin_unlock(&ci_tail->lock);`
`339`	`339`	`cluster_set_next_flag(&list->tail, idx, 0);`
`340`	`340`	`}`
`341`	`341`	`}`