[PATCH 3/3] Add /sys/hypervisor/s390 as mount point for s390-hypfs

[PATCH 3/3] Add /sys/hypervisor/s390 as mount point for s390-hypfs

[Michael Holzheu]

This patch creates /sys/hypervisor/s390 as mount point
for s390-hypfs.

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>

---

 arch/s390/hypfs/inode.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff -urpN linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/inode.c linux-2.6.16-hypfs-2006-04-28-update3/arch/s390/hypfs/inode.c
--- linux-2.6.16-hypfs-2006-04-28-update2/arch/s390/hypfs/inode.c	2006-05-04 10:23:49.000000000 +0200
+++ linux-2.6.16-hypfs-2006-04-28-update3/arch/s390/hypfs/inode.c	2006-05-04 10:31:55.000000000 +0200
@@ -433,7 +433,7 @@ static struct super_operations hypfs_s_o
 	.put_super	= hypfs_put_super
 };
 
-static decl_subsys(hypervisor, NULL, NULL);
+static decl_subsys(s390, NULL, NULL);
 
 static int __init hypfs_init(void)
 {
@@ -443,21 +443,22 @@ static int __init hypfs_init(void)
 		return -ENODATA;
 	if (hypfs_diag_init()) {
 		rc = -ENODATA;
-		goto err_msg;
+		goto fail_diag;
 	}
-	rc = subsystem_register(&hypervisor_subsys);
+	kset_set_kset_s(&s390_subsys, hypervisor_subsys);
+	rc = subsystem_register(&s390_subsys);
 	if (rc)
-		goto err_diag;
+		goto fail_sysfs;
 	rc = register_filesystem(&hypfs_type);
 	if (rc)
-		goto err_sysfs;
+		goto fail_filesystem;
 	return 0;
 
-err_sysfs:
-	subsystem_unregister(&hypervisor_subsys);
-err_diag:
+fail_filesystem:
+	subsystem_unregister(&s390_subsys);
+fail_sysfs:
 	hypfs_diag_exit();
-err_msg:
+fail_diag:
 	printk(KERN_ERR "hypfs: Initialization failed with rc = %i.\n", rc);
 	return rc;
 }
@@ -466,7 +467,7 @@ static void __exit hypfs_exit(void)
 {
 	hypfs_diag_exit();
 	unregister_filesystem(&hypfs_type);
-	subsystem_unregister(&hypervisor_subsys);
+	subsystem_unregister(&s390_subsys);
 }
 
 module_init(hypfs_init)