#define DEBUG_SUBSYSTEM S_LLITE
#include <linux/module.h>
+#include <linux/types.h>
#include <linux/random.h>
#include <linux/version.h>
-#include <linux/lustre_lite.h>
-#include <linux/lustre_ha.h>
-#include <linux/lustre_dlm.h>
+#include <lustre_lite.h>
+#include <lustre_ha.h>
+#include <lustre_dlm.h>
#include <linux/init.h>
#include <linux/fs.h>
-#include <linux/lprocfs_status.h>
+#include <lprocfs_status.h>
#include "llite_internal.h"
-struct super_block * ll_get_sb(struct file_system_type *fs_type,
- int flags, const char *devname, void * data)
-{
- /* calls back in fill super */
- return get_sb_nodev(fs_type, flags, data, ll_fill_super);
-}
-
-struct super_block * lustre_get_sb(struct file_system_type *fs_type,
- int flags, const char *devname, void * data)
-{
- /* calls back in fill super */
- return get_sb_nodev(fs_type, flags, data, lustre_fill_super);
-}
-
-static kmem_cache_t *ll_inode_cachep;
+static cfs_mem_cache_t *ll_inode_cachep;
static struct inode *ll_alloc_inode(struct super_block *sb)
{
struct ll_inode_info *lli;
- lprocfs_counter_incr((ll_s2sbi(sb))->ll_stats, LPROC_LL_ALLOC_INODE);
- OBD_SLAB_ALLOC(lli, ll_inode_cachep, SLAB_KERNEL, sizeof *lli);
+ ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
+ OBD_SLAB_ALLOC_PTR(lli, ll_inode_cachep);
if (lli == NULL)
return NULL;
static void ll_destroy_inode(struct inode *inode)
{
struct ll_inode_info *ptr = ll_i2info(inode);
- OBD_SLAB_FREE(ptr, ll_inode_cachep, sizeof(*ptr));
-}
-
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
-{
- struct ll_inode_info *lli = foo;
-
- if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
- SLAB_CTOR_CONSTRUCTOR)
- inode_init_once(&lli->lli_vfs_inode);
+ OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
}
int ll_init_inodecache(void)
{
- ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
- sizeof(struct ll_inode_info),
- 0, SLAB_HWCACHE_ALIGN,
- init_once, NULL);
+ ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
+ sizeof(struct ll_inode_info),
+ 0, SLAB_HWCACHE_ALIGN);
if (ll_inode_cachep == NULL)
return -ENOMEM;
return 0;
void ll_destroy_inodecache(void)
{
- if (kmem_cache_destroy(ll_inode_cachep))
- CERROR("ll_inode_cache: not all structures were freed\n");
+ int rc;
+
+ rc = cfs_mem_cache_destroy(ll_inode_cachep);
+ LASSERTF(rc == 0, "ll_inode_cache: not all structures were freed\n");
}
/* exported operations */
struct super_operations lustre_super_operations =
{
- alloc_inode: ll_alloc_inode,
- destroy_inode: ll_destroy_inode,
- clear_inode: ll_clear_inode,
- put_super: ll_put_super,
- statfs: ll_statfs,
- umount_begin: ll_umount_begin
+ .alloc_inode = ll_alloc_inode,
+ .destroy_inode = ll_destroy_inode,
+ .clear_inode = ll_clear_inode,
+ .delete_inode = ll_delete_inode,
+ .put_super = ll_put_super,
+ .statfs = ll_statfs,
+ .umount_begin = ll_umount_begin,
+ .remount_fs = ll_remount_fs,
};
-struct file_system_type lustre_lite_fs_type = {
- .owner = THIS_MODULE,
- .name = "lustre_lite",
- .get_sb = ll_get_sb,
- .kill_sb = kill_anon_super,
-};
-
-struct file_system_type lustre_fs_type = {
- .owner = THIS_MODULE,
- .name = "lustre",
- .get_sb = lustre_get_sb,
- .kill_sb = kill_anon_super,
-};
+void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
static int __init init_lustre_lite(void)
{
- int rc;
- printk(KERN_INFO "Lustre: Lustre Lite Client File System; "
- "info@clusterfs.com\n");
+ int i, rc, seed[2];
+ struct timeval tv;
+ lnet_process_id_t lnet_id;
+
rc = ll_init_inodecache();
if (rc)
return -ENOMEM;
- ll_file_data_slab = kmem_cache_create("ll_file_data",
+
+ ll_file_data_slab = cfs_mem_cache_create("ll_file_data",
sizeof(struct ll_file_data), 0,
- SLAB_HWCACHE_ALIGN, NULL, NULL);
+ SLAB_HWCACHE_ALIGN);
if (ll_file_data_slab == NULL) {
ll_destroy_inodecache();
return -ENOMEM;
}
+ ll_remote_perm_cachep = cfs_mem_cache_create("ll_remote_perm_cache",
+ sizeof(struct ll_remote_perm),
+ 0, 0);
+ if (ll_remote_perm_cachep == NULL) {
+ cfs_mem_cache_destroy(ll_file_data_slab);
+ ll_file_data_slab = NULL;
+ ll_destroy_inodecache();
+ return -ENOMEM;
+ }
+
+ ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
+ REMOTE_PERM_HASHSIZE *
+ sizeof(struct list_head),
+ 0, 0);
+ if (ll_rmtperm_hash_cachep == NULL) {
+ cfs_mem_cache_destroy(ll_remote_perm_cachep);
+ ll_remote_perm_cachep = NULL;
+ cfs_mem_cache_destroy(ll_file_data_slab);
+ ll_file_data_slab = NULL;
+ ll_destroy_inodecache();
+ return -ENOMEM;
+ }
+
proc_lustre_fs_root = proc_lustre_root ?
proc_mkdir("llite", proc_lustre_root) : NULL;
- rc = register_filesystem(&lustre_lite_fs_type);
- if (!rc) {
- rc = register_filesystem(&lustre_fs_type);
- if (rc)
- unregister_filesystem(&lustre_fs_type);
+ ll_register_cache(&ll_cache_definition);
+
+ lustre_register_client_fill_super(ll_fill_super);
+ lustre_register_client_process_config(ll_process_config);
+
+ ll_get_random_bytes(seed, sizeof(seed));
+
+ /* Nodes with small feet have little entropy
+ * the NID for this node gives the most entropy in the low bits */
+ for (i=0; ; i++) {
+ if (LNetGetId(i, &lnet_id) == -ENOENT) {
+ break;
+ }
+ if (LNET_NETTYP(LNET_NIDNET(lnet_id.nid)) != LOLND) {
+ seed[0] ^= LNET_NIDADDR(lnet_id.nid);
+ }
}
+
+ do_gettimeofday(&tv);
+ ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+
+ init_timer(&ll_capa_timer);
+ ll_capa_timer.function = ll_capa_timer_callback;
+ rc = ll_capa_thread_start();
return rc;
}
static void __exit exit_lustre_lite(void)
{
- unregister_filesystem(&lustre_fs_type);
- unregister_filesystem(&lustre_lite_fs_type);
+#ifdef HAVE_KMEM_CACHE_DESTROY_INT
+ int rc;
+#endif
+ del_timer(&ll_capa_timer);
+ ll_capa_thread_stop();
+ LASSERTF(capa_count[CAPA_SITE_CLIENT] == 0,
+ "client remaining capa count %d\n",
+ capa_count[CAPA_SITE_CLIENT]);
+
+ lustre_register_client_fill_super(NULL);
+ lustre_register_client_process_config(NULL);
+
+ ll_unregister_cache(&ll_cache_definition);
+
ll_destroy_inodecache();
- kmem_cache_destroy(ll_file_data_slab);
+
+ rc = cfs_mem_cache_destroy(ll_rmtperm_hash_cachep);
+ LASSERTF(rc == 0, "couldn't destroy ll_rmtperm_hash_cachep\n");
+ ll_rmtperm_hash_cachep = NULL;
+
+ rc = cfs_mem_cache_destroy(ll_remote_perm_cachep);
+ LASSERTF(rc == 0, "couldn't destroy ll_remote_perm_cachep\n");
+ ll_remote_perm_cachep = NULL;
+
+ rc = cfs_mem_cache_destroy(ll_file_data_slab);
+ LASSERTF(rc == 0, "couldn't destroy ll_file_data slab\n");
+ if (ll_async_page_slab) {
+ rc = cfs_mem_cache_destroy(ll_async_page_slab);
+ LASSERTF(rc == 0, "couldn't destroy ll_async_page slab\n");
+ }
+
if (proc_lustre_fs_root) {
- lprocfs_remove(proc_lustre_fs_root);
- proc_lustre_fs_root = NULL;
+ lprocfs_remove(&proc_lustre_fs_root);
}
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff