[lustre-devel] [PATCH 2/3] lustre: llite: handle registering file system
James Simmons
jsimmons at infradead.org
Mon Jul 30 16:16:33 PDT 2018
Move the code that registers struct file_system_type for lustre
with the VFS layer to the llite layer where it belongs. This
removes the ugly function pointer passing between obdclass and
llite.
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
.../staging/lustre/lustre/include/lustre_disk.h | 3 -
drivers/staging/lustre/lustre/llite/super25.c | 34 +++++++++++-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 --
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 64 ----------------------
4 files changed, 31 insertions(+), 76 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h
index 772ecc9..d5fadde 100644
--- a/drivers/staging/lustre/lustre/include/lustre_disk.h
+++ b/drivers/staging/lustre/lustre/include/lustre_disk.h
@@ -145,9 +145,6 @@ struct lustre_sb_info {
int lustre_put_lsi(struct super_block *sb);
int lmd_parse(char *options, struct lustre_mount_data *lmd);
int lustre_start_mgc(struct super_block *sb);
-void lustre_register_super_ops(int (*cfs)(struct super_block *sb, void *data,
- int silent),
- void (*ksc)(struct super_block *sb));
int lustre_common_put_super(struct super_block *sb);
int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index de43d58..ac8f6f1 100644
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -81,7 +81,6 @@ struct super_operations lustre_super_operations = {
.remount_fs = ll_remount_fs,
.show_options = ll_show_options,
};
-MODULE_ALIAS_FS("lustre");
/** This is the entry point for the mount call into Lustre.
* This is called when a server or client is mounted,
@@ -162,6 +161,30 @@ int lustre_fill_super(struct super_block *sb, void *lmd2_data, int silent)
return rc;
}
+/***************** FS registration ******************/
+static struct dentry *lustre_mount(struct file_system_type *fs_type, int flags,
+ const char *devname, void *data)
+{
+ return mount_nodev(fs_type, flags, data, lustre_fill_super);
+}
+
+static void lustre_kill_super(struct super_block *sb)
+{
+ ll_kill_super(sb);
+ kill_anon_super(sb);
+}
+
+/** Register the "lustre" fs type
+ */
+static struct file_system_type lustre_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "lustre",
+ .mount = lustre_mount,
+ .kill_sb = lustre_kill_super,
+ .fs_flags = FS_RENAME_DOES_D_MOVE,
+};
+MODULE_ALIAS_FS("lustre");
+
static int __init lustre_init(void)
{
int rc;
@@ -224,11 +247,16 @@ static int __init lustre_init(void)
if (rc != 0)
goto out_inode_fini_env;
- lustre_register_super_ops(lustre_fill_super, ll_kill_super);
+ rc = register_filesystem(&lustre_fs_type);
+ if (rc)
+ goto out_xattr_cache;
+
lustre_register_client_process_config(ll_process_config);
return 0;
+out_xattr_cache:
+ ll_xattr_fini();
out_inode_fini_env:
cl_env_put(cl_inode_fini_env, &cl_inode_fini_refcheck);
out_vvp:
@@ -245,8 +273,8 @@ static int __init lustre_init(void)
static void __exit lustre_exit(void)
{
- lustre_register_super_ops(NULL, NULL);
lustre_register_client_process_config(NULL);
+ unregister_filesystem(&lustre_fs_type);
debugfs_remove(llite_root);
kset_unregister(llite_kset);
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 81a4c66..cdaf729 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -510,18 +510,12 @@ static int __init obdclass_init(void)
return err;
err = llog_info_init();
- if (err)
- return err;
-
- err = lustre_register_fs();
return err;
}
static void obdclass_exit(void)
{
- lustre_unregister_fs();
-
misc_deregister(&obd_psdev);
llog_info_fini();
cl_global_fini();
diff --git a/drivers/staging/lustre/lustre/obdclass/obd_mount.c b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
index ac841f4..b84bca4 100644
--- a/drivers/staging/lustre/lustre/obdclass/obd_mount.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_mount.c
@@ -49,11 +49,6 @@
#include <lustre_disk.h>
#include <uapi/linux/lustre/lustre_param.h>
-static DEFINE_SPINLOCK(client_lock);
-static int (*client_fill_super)(struct super_block *sb, void *data,
- int silent);
-static void (*kill_super_cb)(struct super_block *sb);
-
/**************** config llog ********************/
/** Get a config log from the MGS and process it.
@@ -1225,62 +1220,3 @@ int lmd_parse(char *options, struct lustre_mount_data *lmd)
return -EINVAL;
}
EXPORT_SYMBOL(lmd_parse);
-
-/* We can't call ll_fill_super by name because it lives in a module that
- * must be loaded after this one.
- */
-void lustre_register_super_ops(int (*cfs)(struct super_block *sb, void *data,
- int silent),
- void (*ksc)(struct super_block *sb))
-{
- spin_lock(&client_lock);
- client_fill_super = cfs;
- kill_super_cb = ksc;
- spin_unlock(&client_lock);
-}
-EXPORT_SYMBOL(lustre_register_super_ops);
-
-/***************** FS registration ******************/
-static struct dentry *lustre_mount(struct file_system_type *fs_type, int flags,
- const char *devname, void *data)
-{
- struct dentry *root;
-
- spin_lock(&client_lock);
- if (!client_fill_super)
- request_module("lustre");
- root = mount_nodev(fs_type, flags, data, client_fill_super);
- spin_unlock(&client_lock);
- return root;
-}
-
-static void lustre_kill_super(struct super_block *sb)
-{
- struct lustre_sb_info *lsi = s2lsi(sb);
-
- if (kill_super_cb && lsi)
- (*kill_super_cb)(sb);
-
- kill_anon_super(sb);
-}
-
-/** Register the "lustre" fs type
- */
-static struct file_system_type lustre_fs_type = {
- .owner = THIS_MODULE,
- .name = "lustre",
- .mount = lustre_mount,
- .kill_sb = lustre_kill_super,
- .fs_flags = FS_RENAME_DOES_D_MOVE,
-};
-MODULE_ALIAS_FS("lustre");
-
-int lustre_register_fs(void)
-{
- return register_filesystem(&lustre_fs_type);
-}
-
-int lustre_unregister_fs(void)
-{
- return unregister_filesystem(&lustre_fs_type);
-}
--
1.8.3.1
More information about the lustre-devel
mailing list