-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <lprocfs_status.h>
#include "llite_internal.h"
-static cfs_mem_cache_t *ll_inode_cachep;
+static struct kmem_cache *ll_inode_cachep;
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_GFP(lli, ll_inode_cachep, CFS_ALLOC_IO);
- if (lli == NULL)
- return NULL;
-
- inode_init_once(&lli->lli_vfs_inode);
- ll_lli_init(lli);
+ struct ll_inode_info *lli;
+ ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
+ OBD_SLAB_ALLOC_PTR_GFP(lli, ll_inode_cachep, __GFP_IO);
+ if (lli == NULL)
+ return NULL;
+
+ inode_init_once(&lli->lli_vfs_inode);
+ return &lli->lli_vfs_inode;
+}
- return &lli->lli_vfs_inode;
+#ifdef HAVE_INODE_I_RCU
+static void ll_inode_destroy_callback(struct rcu_head *head)
+{
+ struct inode *inode = container_of(head, struct inode, i_rcu);
+ struct ll_inode_info *ptr = ll_i2info(inode);
+ OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
}
static void ll_destroy_inode(struct inode *inode)
{
- struct ll_inode_info *ptr = ll_i2info(inode);
- OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
+ call_rcu(&inode->i_rcu, ll_inode_destroy_callback);
}
+#else
+static void ll_destroy_inode(struct inode *inode)
+{
+ struct ll_inode_info *ptr = ll_i2info(inode);
+ OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
+}
+#endif
int ll_init_inodecache(void)
{
- ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
- sizeof(struct ll_inode_info),
- 0, CFS_SLAB_HWCACHE_ALIGN);
- if (ll_inode_cachep == NULL)
- return -ENOMEM;
- return 0;
+ ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
+ sizeof(struct ll_inode_info),
+ 0, SLAB_HWCACHE_ALIGN, NULL);
+ if (ll_inode_cachep == NULL)
+ return -ENOMEM;
+ return 0;
}
void ll_destroy_inodecache(void)
{
- int rc;
-
- rc = cfs_mem_cache_destroy(ll_inode_cachep);
- LASSERTF(rc == 0, "ll_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(ll_inode_cachep);
}
/* exported operations */
{
.alloc_inode = ll_alloc_inode,
.destroy_inode = ll_destroy_inode,
+#ifdef HAVE_SBOPS_EVICT_INODE
+ .evict_inode = ll_delete_inode,
+#else
.clear_inode = ll_clear_inode,
.delete_inode = ll_delete_inode,
+#endif
.put_super = ll_put_super,
.statfs = ll_statfs,
.umount_begin = ll_umount_begin,
static int __init init_lustre_lite(void)
{
- int i, rc, seed[2];
- struct timeval tv;
- lnet_process_id_t lnet_id;
-
-#ifndef CRAY_XT3
- /* 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);
-#endif
+ 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 = cfs_mem_cache_create("ll_file_data",
- sizeof(struct ll_file_data), 0,
- CFS_SLAB_HWCACHE_ALIGN);
- if (ll_file_data_slab == NULL) {
- ll_destroy_inodecache();
- return -ENOMEM;
- }
+ CLASSERT(sizeof(LUSTRE_VOLATILE_HDR) == LUSTRE_VOLATILE_HDR_LEN + 1);
- 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;
- }
+ /* 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_INFO, "Lustre client module (%p).\n",
+ &lustre_super_operations);
- ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
- REMOTE_PERM_HASHSIZE *
- sizeof(cfs_list_t),
- 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();
+ rc = ll_init_inodecache();
+ if (rc)
return -ENOMEM;
- }
+ ll_file_data_slab = kmem_cache_create("ll_file_data",
+ sizeof(struct ll_file_data), 0,
+ SLAB_HWCACHE_ALIGN, NULL);
+ if (ll_file_data_slab == NULL) {
+ ll_destroy_inodecache();
+ return -ENOMEM;
+ }
+
+ ll_remote_perm_cachep = kmem_cache_create("ll_remote_perm_cache",
+ sizeof(struct ll_remote_perm),
+ 0, 0, NULL);
+ if (ll_remote_perm_cachep == NULL) {
+ kmem_cache_destroy(ll_file_data_slab);
+ ll_file_data_slab = NULL;
+ ll_destroy_inodecache();
+ return -ENOMEM;
+ }
+
+ ll_rmtperm_hash_cachep = kmem_cache_create("ll_rmtperm_hash_cache",
+ REMOTE_PERM_HASHSIZE *
+ sizeof(cfs_list_t),
+ 0, 0, NULL);
+ if (ll_rmtperm_hash_cachep == NULL) {
+ kmem_cache_destroy(ll_remote_perm_cachep);
+ ll_remote_perm_cachep = NULL;
+ kmem_cache_destroy(ll_file_data_slab);
+ ll_file_data_slab = NULL;
+ ll_destroy_inodecache();
+ return -ENOMEM;
+ }
proc_lustre_fs_root = proc_lustre_root ?
- lprocfs_register("llite", proc_lustre_root, NULL, NULL) : NULL;
+ lprocfs_seq_register("llite", proc_lustre_root,
+ NULL, NULL) : NULL;
lustre_register_client_fill_super(ll_fill_super);
lustre_register_kill_super_cb(ll_kill_super);
}
}
- cfs_gettimeofday(&tv);
- cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+ do_gettimeofday(&tv);
+ cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
init_timer(&ll_capa_timer);
ll_capa_timer.function = ll_capa_timer_callback;
if (rc == 0)
rc = vvp_global_init();
+ if (rc == 0)
+ rc = ll_xattr_init();
+
return rc;
}
static void __exit exit_lustre_lite(void)
{
- int rc;
-
+ ll_xattr_fini();
vvp_global_fini();
del_timer(&ll_capa_timer);
ll_capa_thread_stop();
ll_destroy_inodecache();
- 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;
+ kmem_cache_destroy(ll_rmtperm_hash_cachep);
+ 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;
+ kmem_cache_destroy(ll_remote_perm_cachep);
+ 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 (proc_lustre_fs_root)
- lprocfs_remove(&proc_lustre_fs_root);
+ kmem_cache_destroy(ll_file_data_slab);
+ if (proc_lustre_fs_root)
+ lprocfs_remove(&proc_lustre_fs_root);
}
MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff