diff options
Diffstat (limited to 'fs/hfsplus/super.c')
-rw-r--r-- | fs/hfsplus/super.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 7843f792a4b7..d279d5924f28 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
12 | #include <linux/init.h> | 11 | #include <linux/init.h> |
13 | #include <linux/pagemap.h> | 12 | #include <linux/pagemap.h> |
@@ -212,8 +211,10 @@ static void hfsplus_put_super(struct super_block *sb) | |||
212 | sb->s_fs_info = NULL; | 211 | sb->s_fs_info = NULL; |
213 | } | 212 | } |
214 | 213 | ||
215 | static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf) | 214 | static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf) |
216 | { | 215 | { |
216 | struct super_block *sb = dentry->d_sb; | ||
217 | |||
217 | buf->f_type = HFSPLUS_SUPER_MAGIC; | 218 | buf->f_type = HFSPLUS_SUPER_MAGIC; |
218 | buf->f_bsize = sb->s_blocksize; | 219 | buf->f_bsize = sb->s_blocksize; |
219 | buf->f_blocks = HFSPLUS_SB(sb).total_blocks << HFSPLUS_SB(sb).fs_shift; | 220 | buf->f_blocks = HFSPLUS_SB(sb).total_blocks << HFSPLUS_SB(sb).fs_shift; |
@@ -450,10 +451,12 @@ static void hfsplus_destroy_inode(struct inode *inode) | |||
450 | 451 | ||
451 | #define HFSPLUS_INODE_SIZE sizeof(struct hfsplus_inode_info) | 452 | #define HFSPLUS_INODE_SIZE sizeof(struct hfsplus_inode_info) |
452 | 453 | ||
453 | static struct super_block *hfsplus_get_sb(struct file_system_type *fs_type, | 454 | static int hfsplus_get_sb(struct file_system_type *fs_type, |
454 | int flags, const char *dev_name, void *data) | 455 | int flags, const char *dev_name, void *data, |
456 | struct vfsmount *mnt) | ||
455 | { | 457 | { |
456 | return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super); | 458 | return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super, |
459 | mnt); | ||
457 | } | 460 | } |
458 | 461 | ||
459 | static struct file_system_type hfsplus_fs_type = { | 462 | static struct file_system_type hfsplus_fs_type = { |