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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
romfs
/
inode.c
diff --git
a/fs/romfs/inode.c
b/fs/romfs/inode.c
index
22eed61
..
9b9eda7
100644
(file)
--- a/
fs/romfs/inode.c
+++ b/
fs/romfs/inode.c
@@
-179,12
+179,12
@@
outnobh:
/* That's simple too. */
static int
/* That's simple too. */
static int
-romfs_statfs(struct
dentry *dentry
, struct kstatfs *buf)
+romfs_statfs(struct
super_block *sb
, struct kstatfs *buf)
{
buf->f_type = ROMFS_MAGIC;
buf->f_bsize = ROMBSIZE;
buf->f_bfree = buf->f_bavail = buf->f_ffree;
{
buf->f_type = ROMFS_MAGIC;
buf->f_bsize = ROMBSIZE;
buf->f_bfree = buf->f_bavail = buf->f_ffree;
- buf->f_blocks = (romfs_maxsize(
dentry->d_
sb)+ROMBSIZE-1)>>ROMBSBITS;
+ buf->f_blocks = (romfs_maxsize(sb)+ROMBSIZE-1)>>ROMBSBITS;
buf->f_namelen = ROMFS_MAXFN;
return 0;
}
buf->f_namelen = ROMFS_MAXFN;
return 0;
}
@@
-459,7
+459,7
@@
err_out:
/* Mapping from our types to the kernel */
/* Mapping from our types to the kernel */
-static
const
struct address_space_operations romfs_aops = {
+static struct address_space_operations romfs_aops = {
.readpage = romfs_readpage
};
.readpage = romfs_readpage
};
@@
-607,11
+607,10
@@
static struct super_operations romfs_ops = {
.remount_fs = romfs_remount,
};
.remount_fs = romfs_remount,
};
-static
int
romfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct super_block *
romfs_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, romfs_fill_super,
- mnt);
+ return get_sb_bdev(fs_type, flags, dev_name, data, romfs_fill_super);
}
static struct file_system_type romfs_fs_type = {
}
static struct file_system_type romfs_fs_type = {