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
b61e7fc
..
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;
@@
-125,7
+125,7
@@
static int __init init_lustre_lite(void)
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;
@@
-143,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);
@@
-175,7
+175,7
@@
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);