aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-29 04:02:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:20 -0400
commit3d71f86f4dfccd749e4421f10301f3f3b31da88a (patch)
tree7a052e776b660a2fa1bbe3702fd061bc3d3e6a37
parent6a6375db13703b42dd51b28576d444bb73c541b9 (diff)
mm: use non-racy method for /proc/swaps creation
Use proc_create() to make sure that ->proc_fops be setup before gluing PDE to main tree. Signed-off-by: Denis V. Lunev <den@openvz.org> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/swapfile.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 67051be7083a..bd1bb5920306 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1426,11 +1426,7 @@ static const struct file_operations proc_swaps_operations = {
1426 1426
1427static int __init procswaps_init(void) 1427static int __init procswaps_init(void)
1428{ 1428{
1429 struct proc_dir_entry *entry; 1429 proc_create("swaps", 0, NULL, &proc_swaps_operations);
1430
1431 entry = create_proc_entry("swaps", 0, NULL);
1432 if (entry)
1433 entry->proc_fops = &proc_swaps_operations;
1434 return 0; 1430 return 0;
1435} 1431}
1436__initcall(procswaps_init); 1432__initcall(procswaps_init);