The patch titled
Add /sys/hypervisor/s390 as mount point for s390-hypfs
has been added to the -mm tree. Its filename is
add-sys-hypervisor-s390-as-mount-point-for-s390-hypfs.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Michael Holzheu <holzheu@xxxxxxxxxx>
This patch creates /sys/hypervisor/s390 as mount point for s390-hypfs.
Acked-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/hypfs/inode.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff -puN arch/s390/hypfs/inode.c~add-sys-hypervisor-s390-as-mount-point-for-s390-hypfs arch/s390/hypfs/inode.c
--- devel/arch/s390/hypfs/inode.c~add-sys-hypervisor-s390-as-mount-point-for-s390-hypfs 2006-05-10 01:40:02.000000000 -0700
+++ devel-akpm/arch/s390/hypfs/inode.c 2006-05-10 01:40:02.000000000 -0700
@@ -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)
_
Patches currently in -mm which might be from holzheu@xxxxxxxxxx are
s390-hypervisor-file-system.patch
s390-hypervisor-file-system-fixes.patch
s390-hypervisor-file-system-rename-hypfs-to-s390-hypfs.patch
add-sys-hypervisor-subsystem.patch
add-sys-hypervisor-s390-as-mount-point-for-s390-hypfs.patch
strstrip-api.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
