git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
sysv
/
inode.c
diff --git
a/fs/sysv/inode.c
b/fs/sysv/inode.c
index
fa33ece
..
ead9864
100644
(file)
--- a/
fs/sysv/inode.c
+++ b/
fs/sysv/inode.c
@@
-85,8
+85,9
@@
static void sysv_put_super(struct super_block *sb)
kfree(sbi);
}
kfree(sbi);
}
-static int sysv_statfs(struct
super_block *sb
, struct kstatfs *buf)
+static int sysv_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
{
+ struct super_block *sb = dentry->d_sb;
struct sysv_sb_info *sbi = SYSV_SB(sb);
buf->f_type = sb->s_magic;
struct sysv_sb_info *sbi = SYSV_SB(sb);
buf->f_type = sb->s_magic;
@@
-200,7
+201,7
@@
static void sysv_read_inode(struct inode *inode)
inode->i_ctime.tv_nsec = 0;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
inode->i_ctime.tv_nsec = 0;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
- inode->i_blocks =
inode->i_blksize =
0;
+ inode->i_blocks = 0;
si = SYSV_I(inode);
for (block = 0; block < 10+1+1+1; block++)
si = SYSV_I(inode);
for (block = 0; block < 10+1+1+1; block++)
@@
-300,13
+301,13
@@
static void sysv_delete_inode(struct inode *inode)
unlock_kernel();
}
unlock_kernel();
}
-static
kmem_cache_t
*sysv_inode_cachep;
+static
struct kmem_cache
*sysv_inode_cachep;
static struct inode *sysv_alloc_inode(struct super_block *sb)
{
struct sysv_inode_info *si;
static struct inode *sysv_alloc_inode(struct super_block *sb)
{
struct sysv_inode_info *si;
- si = kmem_cache_alloc(sysv_inode_cachep,
SLAB
_KERNEL);
+ si = kmem_cache_alloc(sysv_inode_cachep,
GFP
_KERNEL);
if (!si)
return NULL;
return &si->vfs_inode;
if (!si)
return NULL;
return &si->vfs_inode;
@@
-317,7
+318,7
@@
static void sysv_destroy_inode(struct inode *inode)
kmem_cache_free(sysv_inode_cachep, SYSV_I(inode));
}
kmem_cache_free(sysv_inode_cachep, SYSV_I(inode));
}
-static void init_once(void *p,
kmem_cache_t
*cachep, unsigned long flags)
+static void init_once(void *p,
struct kmem_cache
*cachep, unsigned long flags)
{
struct sysv_inode_info *si = (struct sysv_inode_info *)p;
{
struct sysv_inode_info *si = (struct sysv_inode_info *)p;
@@
-342,7
+343,7
@@
int __init sysv_init_icache(void)
{
sysv_inode_cachep = kmem_cache_create("sysv_inode_cache",
sizeof(struct sysv_inode_info), 0,
{
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;
init_once, NULL);
if (!sysv_inode_cachep)
return -ENOMEM;