aboutsummaryrefslogtreecommitdiffstats
path: root/fs/adfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-10-03 12:37:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-10-24 23:43:27 -0400
commit2d1d9b5b5cc2d7d528a7cbf621d924de38b1b6b6 (patch)
tree0e4b74b8951c842737a855ca1367009f7124b5f0 /fs/adfs
parent30687e0a47e89f56489ab73965ee88231e611986 (diff)
adfs: delayed freeing of sbi
makes ->d_hash() and ->d_compare() safety in RCU mode independent from vfsmount_lock. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/adfs')
-rw-r--r--fs/adfs/adfs.h9
-rw-r--r--fs/adfs/super.c3
2 files changed, 7 insertions, 5 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 585adafb0cc2..c770337c4b45 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -43,9 +43,12 @@ struct adfs_dir_ops;
43 * ADFS file system superblock data in memory 43 * ADFS file system superblock data in memory
44 */ 44 */
45struct adfs_sb_info { 45struct adfs_sb_info {
46 struct adfs_discmap *s_map; /* bh list containing map */ 46 union { struct {
47 struct adfs_dir_ops *s_dir; /* directory operations */ 47 struct adfs_discmap *s_map; /* bh list containing map */
48 48 struct adfs_dir_ops *s_dir; /* directory operations */
49 };
50 struct rcu_head rcu; /* used only at shutdown time */
51 };
49 kuid_t s_uid; /* owner uid */ 52 kuid_t s_uid; /* owner uid */
50 kgid_t s_gid; /* owner gid */ 53 kgid_t s_gid; /* owner gid */
51 umode_t s_owner_mask; /* ADFS owner perm -> unix perm */ 54 umode_t s_owner_mask; /* ADFS owner perm -> unix perm */
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 0ff4bae2c2a2..7b3003cb6f1b 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -123,8 +123,7 @@ static void adfs_put_super(struct super_block *sb)
123 for (i = 0; i < asb->s_map_size; i++) 123 for (i = 0; i < asb->s_map_size; i++)
124 brelse(asb->s_map[i].dm_bh); 124 brelse(asb->s_map[i].dm_bh);
125 kfree(asb->s_map); 125 kfree(asb->s_map);
126 kfree(asb); 126 kfree_rcu(asb, rcu);
127 sb->s_fs_info = NULL;
128} 127}
129 128
130static int adfs_show_options(struct seq_file *seq, struct dentry *root) 129static int adfs_show_options(struct seq_file *seq, struct dentry *root)