diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
| commit | cbe56159a3e60624b5f44cf48b640fa470436e34 (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /fs/configfs/dir.c | |
| parent | Merge branch 'master' into 83xx (diff) | |
| parent | [POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff) | |
| download | linux-cbe56159a3e60624b5f44cf48b640fa470436e34.tar.xz linux-cbe56159a3e60624b5f44cf48b640fa470436e34.zip | |
Merge branch 'master' into 83xx
Diffstat (limited to 'fs/configfs/dir.c')
| -rw-r--r-- | fs/configfs/dir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 1814ba446809..34750d5e4ff2 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c @@ -72,11 +72,10 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent * pare { struct configfs_dirent * sd; - sd = kmem_cache_alloc(configfs_dir_cachep, GFP_KERNEL); + sd = kmem_cache_zalloc(configfs_dir_cachep, GFP_KERNEL); if (!sd) return NULL; - memset(sd, 0, sizeof(*sd)); atomic_set(&sd->s_count, 1); INIT_LIST_HEAD(&sd->s_links); INIT_LIST_HEAD(&sd->s_children); @@ -931,7 +930,7 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) return 0; } -struct inode_operations configfs_dir_inode_operations = { +const struct inode_operations configfs_dir_inode_operations = { .mkdir = configfs_mkdir, .rmdir = configfs_rmdir, .symlink = configfs_symlink, |