projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7122 into release branch
[cascardo/linux.git]
/
fs
/
affs
/
super.c
diff --git
a/fs/affs/super.c
b/fs/affs/super.c
index
5200f49
..
a324045
100644
(file)
--- a/
fs/affs/super.c
+++ b/
fs/affs/super.c
@@
-14,6
+14,7
@@
#include <linux/init.h>
#include <linux/statfs.h>
#include <linux/parser.h>
#include <linux/init.h>
#include <linux/statfs.h>
#include <linux/parser.h>
+#include <linux/magic.h>
#include "affs.h"
extern struct timezone sys_tz;
#include "affs.h"
extern struct timezone sys_tz;
@@
-65,12
+66,12
@@
affs_write_super(struct super_block *sb)
pr_debug("AFFS: write_super() at %lu, clean=%d\n", get_seconds(), clean);
}
pr_debug("AFFS: write_super() at %lu, clean=%d\n", get_seconds(), clean);
}
-static
kmem_cache_t
* affs_inode_cachep;
+static
struct kmem_cache
* affs_inode_cachep;
static struct inode *affs_alloc_inode(struct super_block *sb)
{
struct affs_inode_info *ei;
static struct inode *affs_alloc_inode(struct super_block *sb)
{
struct affs_inode_info *ei;
- ei = (struct affs_inode_info *)kmem_cache_alloc(affs_inode_cachep,
SLAB
_KERNEL);
+ ei = (struct affs_inode_info *)kmem_cache_alloc(affs_inode_cachep,
GFP
_KERNEL);
if (!ei)
return NULL;
ei->vfs_inode.i_version = 1;
if (!ei)
return NULL;
ei->vfs_inode.i_version = 1;
@@
-82,7
+83,7
@@
static void affs_destroy_inode(struct inode *inode)
kmem_cache_free(affs_inode_cachep, AFFS_I(inode));
}
kmem_cache_free(affs_inode_cachep, AFFS_I(inode));
}
-static void init_once(void * foo,
kmem_cache_t
* cachep, unsigned long flags)
+static void init_once(void * foo,
struct kmem_cache
* cachep, unsigned long flags)
{
struct affs_inode_info *ei = (struct affs_inode_info *) foo;
{
struct affs_inode_info *ei = (struct affs_inode_info *) foo;
@@
-108,11
+109,10
@@
static int init_inodecache(void)
static void destroy_inodecache(void)
{
static void destroy_inodecache(void)
{
- if (kmem_cache_destroy(affs_inode_cachep))
- printk(KERN_INFO "affs_inode_cache: not all structures were freed\n");
+ kmem_cache_destroy(affs_inode_cachep);
}
}
-static struct super_operations affs_sops = {
+static
const
struct super_operations affs_sops = {
.alloc_inode = affs_alloc_inode,
.destroy_inode = affs_destroy_inode,
.read_inode = affs_read_inode,
.alloc_inode = affs_alloc_inode,
.destroy_inode = affs_destroy_inode,
.read_inode = affs_read_inode,
@@
-279,11
+279,10
@@
static int affs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_op = &affs_sops;
sb->s_flags |= MS_NODIRATIME;
sb->s_op = &affs_sops;
sb->s_flags |= MS_NODIRATIME;
- sbi = k
m
alloc(sizeof(struct affs_sb_info), GFP_KERNEL);
+ sbi = k
z
alloc(sizeof(struct affs_sb_info), GFP_KERNEL);
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
if (!sbi)
return -ENOMEM;
sb->s_fs_info = sbi;
- memset(sbi, 0, sizeof(*sbi));
init_MUTEX(&sbi->s_bmlock);
if (!parse_options(data,&uid,&gid,&i,&reserved,&root_block,
init_MUTEX(&sbi->s_bmlock);
if (!parse_options(data,&uid,&gid,&i,&reserved,&root_block,