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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
adfs
/
super.c
diff --git
a/fs/adfs/super.c
b/fs/adfs/super.c
index
8201101
..
2439632
100644
(file)
--- a/
fs/adfs/super.c
+++ b/
fs/adfs/super.c
@@
-196,17
+196,17
@@
static int adfs_remount(struct super_block *sb, int *flags, char *data)
return parse_options(sb, data);
}
return parse_options(sb, data);
}
-static int adfs_statfs(struct
dentry *dentry
, struct kstatfs *buf)
+static int adfs_statfs(struct
super_block *sb
, struct kstatfs *buf)
{
{
- struct adfs_sb_info *asb = ADFS_SB(
dentry->d_
sb);
+ struct adfs_sb_info *asb = ADFS_SB(sb);
buf->f_type = ADFS_SUPER_MAGIC;
buf->f_namelen = asb->s_namelen;
buf->f_type = ADFS_SUPER_MAGIC;
buf->f_namelen = asb->s_namelen;
- buf->f_bsize =
dentry->d_
sb->s_blocksize;
+ buf->f_bsize = sb->s_blocksize;
buf->f_blocks = asb->s_size;
buf->f_files = asb->s_ids_per_zone * asb->s_map_size;
buf->f_bavail =
buf->f_blocks = asb->s_size;
buf->f_files = asb->s_ids_per_zone * asb->s_map_size;
buf->f_bavail =
- buf->f_bfree = adfs_map_free(
dentry->d_
sb);
+ buf->f_bfree = adfs_map_free(sb);
buf->f_ffree = (long)(buf->f_bfree * buf->f_files) / (long)buf->f_blocks;
return 0;
buf->f_ffree = (long)(buf->f_bfree * buf->f_files) / (long)buf->f_blocks;
return 0;
@@
-241,8
+241,7
@@
static int init_inodecache(void)
{
adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
sizeof(struct adfs_inode_info),
{
adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
sizeof(struct adfs_inode_info),
- 0, (SLAB_RECLAIM_ACCOUNT|
- SLAB_MEM_SPREAD),
+ 0, SLAB_RECLAIM_ACCOUNT,
init_once, NULL);
if (adfs_inode_cachep == NULL)
return -ENOMEM;
init_once, NULL);
if (adfs_inode_cachep == NULL)
return -ENOMEM;
@@
-308,7
+307,7
@@
static struct adfs_discmap *adfs_read_map(struct super_block *sb, struct adfs_di
if (adfs_checkmap(sb, dm))
return dm;
if (adfs_checkmap(sb, dm))
return dm;
- adfs_error(sb, "map corrupted");
+ adfs_error(sb,
NULL,
"map corrupted");
error_free:
while (--zone >= 0)
error_free:
while (--zone >= 0)
@@
-470,11
+469,10
@@
error:
return -EINVAL;
}
return -EINVAL;
}
-static
int
adfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct super_block *
adfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
{
- return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super,
- mnt);
+ return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super);
}
static struct file_system_type adfs_fs_type = {
}
static struct file_system_type adfs_fs_type = {