Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[firefly-linux-kernel-4.4.55.git] / fs / hfsplus / super.c

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index b712d34d458d67ea9a6798b8d7dd407fa46c660d..194eede52fa46005949042c37d8e57e3ef8fe7db 100644 (file)
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pagemap.h>
@@ -212,8 +211,10 @@ static void hfsplus_put_super(struct super_block *sb)
        sb->s_fs_info = NULL;
 }
 
-static int hfsplus_statfs(struct super_block *sb, struct kstatfs *buf)
+static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
+       struct super_block *sb = dentry->d_sb;
+
        buf->f_type = HFSPLUS_SUPER_MAGIC;
        buf->f_bsize = sb->s_blocksize;
        buf->f_blocks = HFSPLUS_SB(sb).total_blocks << HFSPLUS_SB(sb).fs_shift;
@@ -316,8 +317,9 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
        vhdr = HFSPLUS_SB(sb).s_vhdr;
 
        /* Copy parts of the volume header into the superblock */
-       sb->s_magic = be16_to_cpu(vhdr->signature);
-       if (be16_to_cpu(vhdr->version) != HFSPLUS_CURRENT_VERSION) {
+       sb->s_magic = HFSPLUS_VOLHEAD_SIG;
+       if (be16_to_cpu(vhdr->version) < HFSPLUS_MIN_VERSION ||
+           be16_to_cpu(vhdr->version) > HFSPLUS_CURRENT_VERSION) {
                printk(KERN_ERR "hfs: wrong filesystem version\n");
                goto cleanup;
        }
@@ -449,10 +451,12 @@ static void hfsplus_destroy_inode(struct inode *inode)
 
 #define HFSPLUS_INODE_SIZE     sizeof(struct hfsplus_inode_info)
 
-static struct super_block *hfsplus_get_sb(struct file_system_type *fs_type,
-                                         int flags, const char *dev_name, void *data)
+static int hfsplus_get_sb(struct file_system_type *fs_type,
+                         int flags, const char *dev_name, void *data,
+                         struct vfsmount *mnt)
 {
-       return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super);
+       return get_sb_bdev(fs_type, flags, dev_name, data, hfsplus_fill_super,
+                          mnt);
 }
 
 static struct file_system_type hfsplus_fs_type = {
@@ -489,8 +493,7 @@ static int __init init_hfsplus_fs(void)
 static void __exit exit_hfsplus_fs(void)
 {
        unregister_filesystem(&hfsplus_fs_type);
-       if (kmem_cache_destroy(hfsplus_inode_cachep))
-               printk(KERN_ERR "hfsplus_inode_cache: not all structures were freed\n");
+       kmem_cache_destroy(hfsplus_inode_cachep);
 }
 
 module_init(init_hfsplus_fs)