Merge branch 'fix/hda' into topic/hda

[karo-tx-linux.git] / fs / fat / inode.c

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 808cac7edcfba8a05e9982cce77f940c530f95b0..3ab841054d533c1853f1835e1386b53c56be7447 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -518,7 +518,6 @@ static struct inode *fat_alloc_inode(struct super_block *sb)
 static void fat_i_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
-       INIT_LIST_HEAD(&inode->i_dentry);
        kmem_cache_free(fat_inode_cachep, MSDOS_I(inode));
 }
 
@@ -672,7 +671,7 @@ int fat_sync_inode(struct inode *inode)
 
 EXPORT_SYMBOL_GPL(fat_sync_inode);
 
-static int fat_show_options(struct seq_file *m, struct vfsmount *mnt);
+static int fat_show_options(struct seq_file *m, struct dentry *root);
 static const struct super_operations fat_sops = {
        .alloc_inode    = fat_alloc_inode,
        .destroy_inode  = fat_destroy_inode,
@@ -811,9 +810,9 @@ static const struct export_operations fat_export_ops = {
        .get_parent     = fat_get_parent,
 };
 
-static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
+static int fat_show_options(struct seq_file *m, struct dentry *root)
 {
-       struct msdos_sb_info *sbi = MSDOS_SB(mnt->mnt_sb);
+       struct msdos_sb_info *sbi = MSDOS_SB(root->d_sb);
        struct fat_mount_options *opts = &sbi->options;
        int isvfat = opts->isvfat;
 
@@ -898,7 +897,7 @@ enum {
        Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
        Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
        Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
-       Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
+       Opt_obsolete, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
        Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err,
 };
 
@@ -928,17 +927,17 @@ static const match_table_t fat_tokens = {
        {Opt_err_panic, "errors=panic"},
        {Opt_err_ro, "errors=remount-ro"},
        {Opt_discard, "discard"},
-       {Opt_obsolate, "conv=binary"},
-       {Opt_obsolate, "conv=text"},
-       {Opt_obsolate, "conv=auto"},
-       {Opt_obsolate, "conv=b"},
-       {Opt_obsolate, "conv=t"},
-       {Opt_obsolate, "conv=a"},
-       {Opt_obsolate, "fat=%u"},
-       {Opt_obsolate, "blocksize=%u"},
-       {Opt_obsolate, "cvf_format=%20s"},
-       {Opt_obsolate, "cvf_options=%100s"},
-       {Opt_obsolate, "posix"},
+       {Opt_obsolete, "conv=binary"},
+       {Opt_obsolete, "conv=text"},
+       {Opt_obsolete, "conv=auto"},
+       {Opt_obsolete, "conv=b"},
+       {Opt_obsolete, "conv=t"},
+       {Opt_obsolete, "conv=a"},
+       {Opt_obsolete, "fat=%u"},
+       {Opt_obsolete, "blocksize=%u"},
+       {Opt_obsolete, "cvf_format=%20s"},
+       {Opt_obsolete, "cvf_options=%100s"},
+       {Opt_obsolete, "posix"},
        {Opt_err, NULL},
 };
 static const match_table_t msdos_tokens = {
@@ -1170,7 +1169,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
                        break;
 
                /* obsolete mount options */
-               case Opt_obsolate:
+               case Opt_obsolete:
                        fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, "
                               "not supported now", p);
                        break;