Skip to content

Commit

Permalink
hpfs: make freeing sbi and codetables rcu-delayed
Browse files Browse the repository at this point in the history
makes ->d_hash() and ->d_compare() safety in RCU mode independent
from vfsmount_lock

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Oct 25, 2013
1 parent e2fec7c commit 30687e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions fs/hpfs/hpfs_fn.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ struct hpfs_sb_info {
unsigned sb_c_bitmap; /* current bitmap */
unsigned sb_max_fwd_alloc; /* max forwad allocation */
int sb_timeshift;
struct rcu_head rcu;
};

/* Four 512-byte buffers and the 2k block obtained by concatenating them */
Expand Down
28 changes: 14 additions & 14 deletions fs/hpfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,24 @@ int hpfs_stop_cycles(struct super_block *s, int key, int *c1, int *c2,
return 0;
}

static void hpfs_put_super(struct super_block *s)
static void free_sbi(struct hpfs_sb_info *sbi)
{
struct hpfs_sb_info *sbi = hpfs_sb(s);
kfree(sbi->sb_cp_table);
kfree(sbi->sb_bmp_dir);
kfree(sbi);
}

static void lazy_free_sbi(struct rcu_head *rcu)
{
free_sbi(container_of(rcu, struct hpfs_sb_info, rcu));
}

static void hpfs_put_super(struct super_block *s)
{
hpfs_lock(s);
unmark_dirty(s);
hpfs_unlock(s);

kfree(sbi->sb_cp_table);
kfree(sbi->sb_bmp_dir);
s->s_fs_info = NULL;
kfree(sbi);
call_rcu(&hpfs_sb(s)->rcu, lazy_free_sbi);
}

unsigned hpfs_count_one_bitmap(struct super_block *s, secno secno)
Expand Down Expand Up @@ -485,9 +491,6 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent)
}
s->s_fs_info = sbi;

sbi->sb_bmp_dir = NULL;
sbi->sb_cp_table = NULL;

mutex_init(&sbi->hpfs_mutex);
hpfs_lock(s);

Expand Down Expand Up @@ -679,10 +682,7 @@ bail2: brelse(bh0);
bail1:
bail0:
hpfs_unlock(s);
kfree(sbi->sb_bmp_dir);
kfree(sbi->sb_cp_table);
s->s_fs_info = NULL;
kfree(sbi);
free_sbi(sbi);
return -EINVAL;
}

Expand Down

0 comments on commit 30687e0

Please sign in to comment.