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
/
isofs
/
inode.c
diff --git
a/fs/isofs/inode.c
b/fs/isofs/inode.c
index
e5fbb03
..
298f08b
100644
(file)
--- a/
fs/isofs/inode.c
+++ b/
fs/isofs/inode.c
@@
-11,6
+11,7
@@
* 2004 Paul Serice - NFS Export Operations
*/
* 2004 Paul Serice - NFS Export Operations
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-55,7
+56,7
@@
static void isofs_put_super(struct super_block *sb)
}
static void isofs_read_inode(struct inode *);
}
static void isofs_read_inode(struct inode *);
-static int isofs_statfs (struct
dentry
*, struct kstatfs *);
+static int isofs_statfs (struct
super_block
*, struct kstatfs *);
static kmem_cache_t *isofs_inode_cachep;
static kmem_cache_t *isofs_inode_cachep;
@@
-86,8
+87,7
@@
static int init_inodecache(void)
{
isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",
sizeof(struct iso_inode_info),
{
isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",
sizeof(struct iso_inode_info),
- 0, (SLAB_RECLAIM_ACCOUNT|
- SLAB_MEM_SPREAD),
+ 0, SLAB_RECLAIM_ACCOUNT,
init_once, NULL);
if (isofs_inode_cachep == NULL)
return -ENOMEM;
init_once, NULL);
if (isofs_inode_cachep == NULL)
return -ENOMEM;
@@
-900,10
+900,8
@@
out_freesbi:
return -EINVAL;
}
return -EINVAL;
}
-static int isofs_statfs (struct
dentry *dentry
, struct kstatfs *buf)
+static int isofs_statfs (struct
super_block *sb
, struct kstatfs *buf)
{
{
- struct super_block *sb = dentry->d_sb;
-
buf->f_type = ISOFS_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = (ISOFS_SB(sb)->s_nzones
buf->f_type = ISOFS_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = (ISOFS_SB(sb)->s_nzones
@@
-1053,7
+1051,7
@@
static sector_t _isofs_bmap(struct address_space *mapping, sector_t block)
return generic_block_bmap(mapping,block,isofs_get_block);
}
return generic_block_bmap(mapping,block,isofs_get_block);
}
-static
const
struct address_space_operations isofs_aops = {
+static struct address_space_operations isofs_aops = {
.readpage = isofs_readpage,
.sync_page = block_sync_page,
.bmap = _isofs_bmap
.readpage = isofs_readpage,
.sync_page = block_sync_page,
.bmap = _isofs_bmap
@@
-1238,7
+1236,7
@@
static void isofs_read_inode(struct inode *inode)
}
inode->i_uid = sbi->s_uid;
inode->i_gid = sbi->s_gid;
}
inode->i_uid = sbi->s_uid;
inode->i_gid = sbi->s_gid;
- inode->i_blocks = 0;
+ inode->i_blocks =
inode->i_blksize =
0;
ei->i_format_parm[0] = 0;
ei->i_format_parm[1] = 0;
ei->i_format_parm[0] = 0;
ei->i_format_parm[1] = 0;
@@
-1294,6
+1292,7
@@
static void isofs_read_inode(struct inode *inode)
isonum_711 (de->ext_attr_length));
/* Set the number of blocks for stat() - should be done before RR */
isonum_711 (de->ext_attr_length));
/* Set the number of blocks for stat() - should be done before RR */
+ inode->i_blksize = PAGE_CACHE_SIZE; /* For stat() only */
inode->i_blocks = (inode->i_size + 511) >> 9;
/*
inode->i_blocks = (inode->i_size + 511) >> 9;
/*
@@
-1399,11
+1398,10
@@
struct inode *isofs_iget(struct super_block *sb,
return inode;
}
return inode;
}
-static
int
isofs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct super_block *
isofs_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, isofs_fill_super,
- mnt);
+ return get_sb_bdev(fs_type, flags, dev_name, data, isofs_fill_super);
}
static struct file_system_type iso9660_fs_type = {
}
static struct file_system_type iso9660_fs_type = {