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/adfs | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'fs/adfs')
| -rw-r--r-- | fs/adfs/adfs.h | 9 | ||||
| -rw-r--r-- | fs/adfs/super.c | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index c770337..585adaf 100644 --- a/fs/adfs/adfs.h +++ b/fs/adfs/adfs.h @@ -43,12 +43,9 @@ struct adfs_dir_ops; * ADFS file system superblock data in memory */ struct adfs_sb_info { - union { struct { - struct adfs_discmap *s_map; /* bh list containing map */ - struct adfs_dir_ops *s_dir; /* directory operations */ - }; - struct rcu_head rcu; /* used only at shutdown time */ - }; + struct adfs_discmap *s_map; /* bh list containing map */ + struct adfs_dir_ops *s_dir; /* directory operations */ + kuid_t s_uid; /* owner uid */ kgid_t s_gid; /* owner gid */ umode_t s_owner_mask; /* ADFS owner perm -> unix perm */ diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 7b3003c..0ff4bae 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c @@ -123,7 +123,8 @@ static void adfs_put_super(struct super_block *sb) for (i = 0; i < asb->s_map_size; i++) brelse(asb->s_map[i].dm_bh); kfree(asb->s_map); - kfree_rcu(asb, rcu); + kfree(asb); + sb->s_fs_info = NULL; } static int adfs_show_options(struct seq_file *seq, struct dentry *root) |