diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-09 11:08:44 +0000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-01-20 20:12:40 -0500 |
| commit | 7b1952676256d2cdc03d0415a4c0e6bfb64e00ff (patch) | |
| tree | 1525b175967b2907484ea4ebbe2693bcb3c06694 /fs/adfs | |
| parent | 6092b6be304494e311b65935f5e09b510cbd57cc (diff) | |
| download | linux-7b1952676256d2cdc03d0415a4c0e6bfb64e00ff.tar.gz linux-7b1952676256d2cdc03d0415a4c0e6bfb64e00ff.tar.bz2 linux-7b1952676256d2cdc03d0415a4c0e6bfb64e00ff.zip | |
fs/adfs: map: factor out map cleanup
We have several places which deal with releasing the map buffers and
freeing the map array. Provide a helper for this.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/adfs')
| -rw-r--r-- | fs/adfs/adfs.h | 1 | ||||
| -rw-r--r-- | fs/adfs/map.c | 8 | ||||
| -rw-r--r-- | fs/adfs/super.c | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h index 45fd48fbd5e0..6497da8a2c8a 100644 --- a/fs/adfs/adfs.h +++ b/fs/adfs/adfs.h @@ -147,6 +147,7 @@ int adfs_notify_change(struct dentry *dentry, struct iattr *attr); int adfs_map_lookup(struct super_block *sb, u32 frag_id, unsigned int offset); void adfs_map_statfs(struct super_block *sb, struct kstatfs *buf); struct adfs_discmap *adfs_read_map(struct super_block *sb, struct adfs_discrecord *dr); +void adfs_free_map(struct super_block *sb); /* Misc */ __printf(3, 4) diff --git a/fs/adfs/map.c b/fs/adfs/map.c index 4b677cd5d015..8ba8877110ff 100644 --- a/fs/adfs/map.c +++ b/fs/adfs/map.c @@ -421,3 +421,11 @@ error_free: kfree(dm); return ERR_PTR(-EIO); } + +void adfs_free_map(struct super_block *sb) +{ + struct adfs_sb_info *asb = ADFS_SB(sb); + + adfs_map_relse(asb->s_map, asb->s_map_size); + kfree(asb->s_map); +} diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 458824e0ca83..cef16028e9f2 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c @@ -90,12 +90,9 @@ static int adfs_checkdiscrecord(struct adfs_discrecord *dr) static void adfs_put_super(struct super_block *sb) { - int i; struct adfs_sb_info *asb = ADFS_SB(sb); - for (i = 0; i < asb->s_map_size; i++) - brelse(asb->s_map[i].dm_bh); - kfree(asb->s_map); + adfs_free_map(sb); kfree_rcu(asb, rcu); } @@ -412,10 +409,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) root = adfs_iget(sb, &root_obj); sb->s_root = d_make_root(root); if (!sb->s_root) { - int i; - for (i = 0; i < asb->s_map_size; i++) - brelse(asb->s_map[i].dm_bh); - kfree(asb->s_map); + adfs_free_map(sb); adfs_error(sb, "get root inode failed\n"); ret = -EIO; goto error; |