Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
b=19427 correct lmm_object_id and reserve fids for fid-on-OST.
[fs/lustre-release.git]
/
lustre
/
llite
/
super25.c
diff --git
a/lustre/llite/super25.c
b/lustre/llite/super25.c
index
549d320
..
f0c22ba
100644
(file)
--- a/
lustre/llite/super25.c
+++ b/
lustre/llite/super25.c
@@
-54,7
+54,7
@@
static struct inode *ll_alloc_inode(struct super_block *sb)
{
struct ll_inode_info *lli;
ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
- OBD_SLAB_ALLOC_PTR
(lli, ll_inode_cachep
);
+ OBD_SLAB_ALLOC_PTR
_GFP(lli, ll_inode_cachep, CFS_ALLOC_IO
);
if (lli == NULL)
return NULL;
@@
-74,7
+74,7
@@
int ll_init_inodecache(void)
{
ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
sizeof(struct ll_inode_info),
- 0, SLAB_HWCACHE_ALIGN);
+ 0,
CFS_
SLAB_HWCACHE_ALIGN);
if (ll_inode_cachep == NULL)
return -ENOMEM;
return 0;
@@
-99,23
+99,33
@@
struct super_operations lustre_super_operations =
.statfs = ll_statfs,
.umount_begin = ll_umount_begin,
.remount_fs = ll_remount_fs,
+ .show_options = ll_show_options,
};
void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
+int vvp_global_init(void);
+void vvp_global_fini(void);
+
static int __init init_lustre_lite(void)
{
int i, rc, seed[2];
struct timeval tv;
lnet_process_id_t lnet_id;
-
+
+ /* print an address of _any_ initialized kernel symbol from this
+ * module, to allow debugging with gdb that doesn't support data
+ * symbols from modules.*/
+ CDEBUG(D_CONSOLE, "Lustre client module (%p).\n",
+ &lustre_super_operations);
+
rc = ll_init_inodecache();
if (rc)
return -ENOMEM;
ll_file_data_slab = cfs_mem_cache_create("ll_file_data",
sizeof(struct ll_file_data), 0,
- SLAB_HWCACHE_ALIGN);
+
CFS_
SLAB_HWCACHE_ALIGN);
if (ll_file_data_slab == NULL) {
ll_destroy_inodecache();
return -ENOMEM;
@@
-133,7
+143,7
@@
static int __init init_lustre_lite(void)
ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
REMOTE_PERM_HASHSIZE *
- sizeof(
struct list_head
),
+ sizeof(
cfs_list_t
),
0, 0);
if (ll_rmtperm_hash_cachep == NULL) {
cfs_mem_cache_destroy(ll_remote_perm_cachep);
@@
-147,8
+157,6
@@
static int __init init_lustre_lite(void)
proc_lustre_fs_root = proc_lustre_root ?
lprocfs_register("llite", proc_lustre_root, NULL, NULL) : NULL;
- ll_register_cache(&ll_cache_definition);
-
lustre_register_client_fill_super(ll_fill_super);
lustre_register_kill_super_cb(ll_kill_super);
@@
-167,19
+175,26
@@
static int __init init_lustre_lite(void)
}
}
-
do
_gettimeofday(&tv);
+
cfs
_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();
+ /*
+ * XXX normal cleanup is needed here.
+ */
+ if (rc == 0)
+ rc = vvp_global_init();
+
return rc;
}
static void __exit exit_lustre_lite(void)
{
int rc;
-
+
+ vvp_global_fini();
del_timer(&ll_capa_timer);
ll_capa_thread_stop();
LASSERTF(capa_count[CAPA_SITE_CLIENT] == 0,
@@
-191,8
+206,6
@@
static void __exit exit_lustre_lite(void)
lustre_register_client_process_config(NULL);
- ll_unregister_cache(&ll_cache_definition);
-
ll_destroy_inodecache();
rc = cfs_mem_cache_destroy(ll_rmtperm_hash_cachep);
@@
-205,11
+218,6
@@
static void __exit exit_lustre_lite(void)
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);
}