Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23417
b: refs/heads/master
c: 4b6a931
h: refs/heads/master
i:
  23415: 4e729c6
v: v3
  • Loading branch information
Paul Jackson authored and Linus Torvalds committed Mar 24, 2006
1 parent 9773de1 commit 541cf4d
Show file tree
Hide file tree
Showing 38 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44110fe385af23ca5eee8a6ad4ff55d50339097a
refs/heads/master: 4b6a9316fab51af611dc8671f296734089f6a22a
2 changes: 1 addition & 1 deletion trunk/fs/adfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static int init_inodecache(void)
{
adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
sizeof(struct adfs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (adfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/affs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int init_inodecache(void)
{
affs_inode_cachep = kmem_cache_create("affs_inode_cache",
sizeof(struct affs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (affs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/befs/linuxvfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ befs_init_inodecache(void)
{
befs_inode_cachep = kmem_cache_create("befs_inode_cache",
sizeof (struct befs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (befs_inode_cachep == NULL) {
printk(KERN_ERR "befs_init_inodecache: "
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/bfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static int init_inodecache(void)
{
bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
sizeof(struct bfs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (bfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/block_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void __init bdev_cache_init(void)
{
int err;
bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_PANIC,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC,
init_once, NULL);
err = register_filesystem(&bd_type);
if (err)
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ cifs_init_inodecache(void)
{
cifs_inode_cachep = kmem_cache_create("cifs_inode_cache",
sizeof (struct cifsInodeInfo),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
cifs_init_once, NULL);
if (cifs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/coda/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ int coda_init_inodecache(void)
{
coda_inode_cachep = kmem_cache_create("coda_inode_cache",
sizeof(struct coda_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (coda_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/dquot.c
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@ static int __init dquot_init(void)

dquot_cachep = kmem_cache_create("dquot",
sizeof(struct dquot), sizeof(unsigned long) * 4,
SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_PANIC,
SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC,
NULL, NULL);

order = 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/efs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static int init_inodecache(void)
{
efs_inode_cachep = kmem_cache_create("efs_inode_cache",
sizeof(struct efs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (efs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ext2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static int init_inodecache(void)
{
ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
sizeof(struct ext2_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (ext2_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ext3/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ static int init_inodecache(void)
{
ext3_inode_cachep = kmem_cache_create("ext3_inode_cache",
sizeof(struct ext3_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (ext3_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/fat/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int __init fat_cache_init(void)
{
fat_cache_cachep = kmem_cache_create("fat_cache",
sizeof(struct fat_cache),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (fat_cache_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/fat/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static int __init fat_init_inodecache(void)
{
fat_inode_cachep = kmem_cache_create("fat_inode_cache",
sizeof(struct msdos_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (fat_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/freevxfs/vxfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ vxfs_init(void)
{
vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
sizeof(struct vxfs_inode_info), 0,
SLAB_RECLAIM_ACCOUNT, NULL, NULL);
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
if (vxfs_inode_cachep)
return register_filesystem(&vxfs_fs_type);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/hpfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int init_inodecache(void)
{
hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
sizeof(struct hpfs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (hpfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/isofs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int init_inodecache(void)
{
isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",
sizeof(struct iso_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (isofs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/jffs/inode-v23.c
Original file line number Diff line number Diff line change
Expand Up @@ -1812,14 +1812,14 @@ init_jffs_fs(void)
}
#endif
fm_cache = kmem_cache_create("jffs_fm", sizeof(struct jffs_fm),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
NULL, NULL);
if (!fm_cache) {
return -ENOMEM;
}

node_cache = kmem_cache_create("jffs_node",sizeof(struct jffs_node),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
NULL, NULL);
if (!node_cache) {
kmem_cache_destroy(fm_cache);
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/jffs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ static int __init init_jffs2_fs(void)

jffs2_inode_cachep = kmem_cache_create("jffs2_i",
sizeof(struct jffs2_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
jffs2_i_init_once, NULL);
if (!jffs2_inode_cachep) {
printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/jfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ static int __init init_jfs_fs(void)

jfs_inode_cachep =
kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
SLAB_RECLAIM_ACCOUNT, init_once, NULL);
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, init_once, NULL);
if (jfs_inode_cachep == NULL)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/mbcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ mb_cache_create(const char *name, struct mb_cache_op *cache_op,
INIT_LIST_HEAD(&cache->c_indexes_hash[m][n]);
}
cache->c_entry_cache = kmem_cache_create(name, entry_size, 0,
SLAB_RECLAIM_ACCOUNT, NULL, NULL);
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
if (!cache->c_entry_cache)
goto fail;

Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/minix/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int init_inodecache(void)
{
minix_inode_cachep = kmem_cache_create("minix_inode_cache",
sizeof(struct minix_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (minix_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ncpfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static int init_inodecache(void)
{
ncp_inode_cachep = kmem_cache_create("ncp_inode_cache",
sizeof(struct ncp_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (ncp_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/nfs/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ int nfs_init_directcache(void)
{
nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",
sizeof(struct nfs_direct_req),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
NULL, NULL);
if (nfs_direct_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/nfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,7 @@ static int nfs_init_inodecache(void)
{
nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
sizeof(struct nfs_inode),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (nfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/ntfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,7 @@ static int __init init_ntfs_fs(void)

ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,
sizeof(ntfs_inode), 0,
SLAB_RECLAIM_ACCOUNT, NULL, NULL);
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
if (!ntfs_inode_cache) {
printk(KERN_CRIT "NTFS: Failed to create %s!\n",
ntfs_inode_cache_name);
Expand All @@ -3172,7 +3172,7 @@ static int __init init_ntfs_fs(void)

ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,
sizeof(big_ntfs_inode), 0,
SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
ntfs_big_inode_init_once, NULL);
if (!ntfs_big_inode_cache) {
printk(KERN_CRIT "NTFS: Failed to create %s!\n",
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ocfs2/dlm/dlmfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ static int __init init_dlmfs_fs(void)

dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache",
sizeof(struct dlmfs_inode_private),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
dlmfs_init_once, NULL);
if (!dlmfs_inode_cache)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ocfs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ static int ocfs2_initialize_mem_caches(void)
{
ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache",
sizeof(struct ocfs2_inode_info),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
ocfs2_inode_init_once, NULL);
if (!ocfs2_inode_cachep)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int __init proc_init_inodecache(void)
{
proc_inode_cachep = kmem_cache_create("proc_inode_cache",
sizeof(struct proc_inode),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (proc_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/qnx4/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ static int init_inodecache(void)
{
qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache",
sizeof(struct qnx4_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (qnx4_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/reiserfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ static int init_inodecache(void)
reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache",
sizeof(struct
reiserfs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (reiserfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/romfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ static int init_inodecache(void)
{
romfs_inode_cachep = kmem_cache_create("romfs_inode_cache",
sizeof(struct romfs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (romfs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/smbfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static int init_inodecache(void)
{
smb_inode_cachep = kmem_cache_create("smb_inode_cache",
sizeof(struct smb_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (smb_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/sysv/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ int __init sysv_init_icache(void)
{
sysv_inode_cachep = kmem_cache_create("sysv_inode_cache",
sizeof(struct sysv_inode_info), 0,
SLAB_RECLAIM_ACCOUNT,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (!sysv_inode_cachep)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/udf/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static int init_inodecache(void)
{
udf_inode_cachep = kmem_cache_create("udf_inode_cache",
sizeof(struct udf_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (udf_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/ufs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ static int init_inodecache(void)
{
ufs_inode_cachep = kmem_cache_create("ufs_inode_cache",
sizeof(struct ufs_inode_info),
0, SLAB_RECLAIM_ACCOUNT,
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (ufs_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int init_inodecache(void)
{
sock_inode_cachep = kmem_cache_create("sock_inode_cache",
sizeof(struct socket_alloc),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (sock_inode_cachep == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sunrpc/rpc_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ int register_rpc_pipefs(void)
{
rpc_inode_cachep = kmem_cache_create("rpc_inode_cache",
sizeof(struct rpc_inode),
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
init_once, NULL);
if (!rpc_inode_cachep)
return -ENOMEM;
Expand Down

0 comments on commit 541cf4d

Please sign in to comment.