diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /fs/fat | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/fat.h | 1 | ||||
| -rw-r--r-- | fs/fat/inode.c | 19 |
2 files changed, 8 insertions, 12 deletions
diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 7c31f4b..4241e6f 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -102,7 +102,6 @@ struct msdos_sb_info { struct hlist_head dir_hashtable[FAT_HASH_SIZE]; unsigned int dirty; /* fs state before mount */ - struct rcu_head rcu; }; #define FAT_CACHE_VALID 0 /* special case for valid cache */ diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 854b578..0062da2 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -548,16 +548,6 @@ static void fat_set_state(struct super_block *sb, brelse(bh); } -static void delayed_free(struct rcu_head *p) -{ - struct msdos_sb_info *sbi = container_of(p, struct msdos_sb_info, rcu); - unload_nls(sbi->nls_disk); - unload_nls(sbi->nls_io); - if (sbi->options.iocharset != fat_default_iocharset) - kfree(sbi->options.iocharset); - kfree(sbi); -} - static void fat_put_super(struct super_block *sb) { struct msdos_sb_info *sbi = MSDOS_SB(sb); @@ -567,7 +557,14 @@ static void fat_put_super(struct super_block *sb) iput(sbi->fsinfo_inode); iput(sbi->fat_inode); - call_rcu(&sbi->rcu, delayed_free); + unload_nls(sbi->nls_disk); + unload_nls(sbi->nls_io); + + if (sbi->options.iocharset != fat_default_iocharset) + kfree(sbi->options.iocharset); + + sb->s_fs_info = NULL; + kfree(sbi); } static struct kmem_cache *fat_inode_cachep; |