Pull acpi_device_handle_cleanup into release branch

[pandora-kernel.git] / fs / jfs / super.c

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index db6f41d..4f6cfeb 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/parser.h>
 #include <linux/completion.h>
@@ -139,9 +138,9 @@ static void jfs_destroy_inode(struct inode *inode)
        kmem_cache_free(jfs_inode_cachep, ji);
 }
 
-static int jfs_statfs(struct super_block *sb, struct kstatfs *buf)
+static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
-       struct jfs_sb_info *sbi = JFS_SBI(sb);
+       struct jfs_sb_info *sbi = JFS_SBI(dentry->d_sb);
        s64 maxinodes;
        struct inomap *imap = JFS_IP(sbi->ipimap)->i_imap;
 
@@ -565,10 +564,11 @@ static void jfs_unlockfs(struct super_block *sb)
        }
 }
 
-static struct super_block *jfs_get_sb(struct file_system_type *fs_type, 
-       int flags, const char *dev_name, void *data)
+static int jfs_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, jfs_fill_super);
+       return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super,
+                          mnt);
 }
 
 static int jfs_sync_fs(struct super_block *sb, int wait)