Commit af072cf6 authored by Al Viro's avatar Al Viro

hfsplus: switch to rcu-delayed unloading of nls and freeing ->s_fs_info

->d_hash() and ->d_compare() use those, so we need to delay freeing
them.
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a13d1a4d
...@@ -190,6 +190,7 @@ struct hfsplus_sb_info { ...@@ -190,6 +190,7 @@ struct hfsplus_sb_info {
int work_queued; /* non-zero delayed work is queued */ int work_queued; /* non-zero delayed work is queued */
struct delayed_work sync_work; /* FS sync delayed work */ struct delayed_work sync_work; /* FS sync delayed work */
spinlock_t work_lock; /* protects sync_work and work_queued */ spinlock_t work_lock; /* protects sync_work and work_queued */
struct rcu_head rcu;
}; };
#define HFSPLUS_SB_WRITEBACKUP 0 #define HFSPLUS_SB_WRITEBACKUP 0
......
...@@ -277,6 +277,14 @@ void hfsplus_mark_mdb_dirty(struct super_block *sb) ...@@ -277,6 +277,14 @@ void hfsplus_mark_mdb_dirty(struct super_block *sb)
spin_unlock(&sbi->work_lock); spin_unlock(&sbi->work_lock);
} }
static void delayed_free(struct rcu_head *p)
{
struct hfsplus_sb_info *sbi = container_of(p, struct hfsplus_sb_info, rcu);
unload_nls(sbi->nls);
kfree(sbi);
}
static void hfsplus_put_super(struct super_block *sb) static void hfsplus_put_super(struct super_block *sb)
{ {
struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb); struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
...@@ -302,9 +310,7 @@ static void hfsplus_put_super(struct super_block *sb) ...@@ -302,9 +310,7 @@ static void hfsplus_put_super(struct super_block *sb)
hfs_btree_close(sbi->ext_tree); hfs_btree_close(sbi->ext_tree);
kfree(sbi->s_vhdr_buf); kfree(sbi->s_vhdr_buf);
kfree(sbi->s_backup_vhdr_buf); kfree(sbi->s_backup_vhdr_buf);
unload_nls(sbi->nls); call_rcu(&sbi->rcu, delayed_free);
kfree(sb->s_fs_info);
sb->s_fs_info = NULL;
} }
static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf) static int hfsplus_statfs(struct dentry *dentry, struct kstatfs *buf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment