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
/
hfs
/
super.c
diff --git
a/fs/hfs/super.c
b/fs/hfs/super.c
index
4af327a
..
2e1819b
100644
(file)
--- a/
fs/hfs/super.c
+++ b/
fs/hfs/super.c
@@
-12,6
+12,7
@@
* Based on the minix file system code, (C) 1991, 1992 by Linus Torvalds
*/
* Based on the minix file system code, (C) 1991, 1992 by Linus Torvalds
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/mount.h>
#include <linux/module.h>
#include <linux/blkdev.h>
#include <linux/mount.h>
@@
-79,10
+80,8
@@
static void hfs_put_super(struct super_block *sb)
*
* changed f_files/f_ffree to reflect the fs_ablock/free_ablocks.
*/
*
* changed f_files/f_ffree to reflect the fs_ablock/free_ablocks.
*/
-static int hfs_statfs(struct
dentry *dentry
, struct kstatfs *buf)
+static int hfs_statfs(struct
super_block *sb
, struct kstatfs *buf)
{
{
- struct super_block *sb = dentry->d_sb;
-
buf->f_type = HFS_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = (u32)HFS_SB(sb)->fs_ablocks * HFS_SB(sb)->fs_div;
buf->f_type = HFS_SUPER_MAGIC;
buf->f_bsize = sb->s_blocksize;
buf->f_blocks = (u32)HFS_SB(sb)->fs_ablocks * HFS_SB(sb)->fs_div;
@@
-397,6
+396,7
@@
static int hfs_fill_super(struct super_block *sb, void *data, int silent)
if (!root_inode)
goto bail_no_root;
if (!root_inode)
goto bail_no_root;
+ res = -ENOMEM;
sb->s_root = d_alloc_root(root_inode);
if (!sb->s_root)
goto bail_iput;
sb->s_root = d_alloc_root(root_inode);
if (!sb->s_root)
goto bail_iput;
@@
-415,11
+415,10
@@
bail:
return res;
}
return res;
}
-static int hfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data,
- struct vfsmount *mnt)
+static struct super_block *hfs_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, hfs_fill_super
, mnt
);
+ return get_sb_bdev(fs_type, flags, dev_name, data, hfs_fill_super);
}
static struct file_system_type hfs_fs_type = {
}
static struct file_system_type hfs_fs_type = {