UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

erofs: don't use erofs_map_blocks() any more 

Currently, erofs_map_blocks() will be called only from
erofs_{bmap, read_raw_page} which are all for uncompressed files.
So, the compression branch in erofs_map_blocks() is pointless. Let's
remove it and use erofs_map_blocks_flatmode() directly. Also update
related comments.

Link: https://lore.kernel.org/r/20210325071008.573-1-zbestahu@gmail.com
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Yue Hu <huyue2@yulong.com>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
This commit is contained in:
Yue Hu 2021-03-25 15:10:08 +08:00 committed by Gao Xiang
parent 0b964600d3
commit 8137824edd
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/erofs/data.c
View File

@ -109,21 +109,6 @@ err_out:
return err; return err;
} }
int erofs_map_blocks(struct inode *inode,
struct erofs_map_blocks *map, int flags)
{
if (erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout)) {
int err = z_erofs_map_blocks_iter(inode, map, flags);
if (map->mpage) {
put_page(map->mpage);
map->mpage = NULL;
}
return err;
}
return erofs_map_blocks_flatmode(inode, map, flags);
}
static inline struct bio *erofs_read_raw_page(struct bio *bio, static inline struct bio *erofs_read_raw_page(struct bio *bio,
struct address_space *mapping, struct address_space *mapping,
struct page *page, struct page *page,
@ -159,7 +144,7 @@ submit_bio_retry:
erofs_blk_t blknr; erofs_blk_t blknr;
unsigned int blkoff; unsigned int blkoff;
err = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); err = erofs_map_blocks_flatmode(inode, &map, EROFS_GET_BLOCKS_RAW);
if (err) if (err)
goto err_out; goto err_out;
@ -318,7 +303,7 @@ static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
return 0; return 0;
} }
if (!erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW)) if (!erofs_map_blocks_flatmode(inode, &map, EROFS_GET_BLOCKS_RAW))
return erofs_blknr(map.m_pa); return erofs_blknr(map.m_pa);
return 0; return 0;

6
fs/erofs/internal.h
View File

@ -289,7 +289,7 @@ extern const struct address_space_operations erofs_raw_access_aops;
extern const struct address_space_operations z_erofs_aops; extern const struct address_space_operations z_erofs_aops;
/* /*
* Logical to physical block mapping, used by erofs_map_blocks() * Logical to physical block mapping
* *
* Different with other file systems, it is used for 2 access modes: * Different with other file systems, it is used for 2 access modes:
* *
@ -336,7 +336,7 @@ struct erofs_map_blocks {
struct page *mpage; struct page *mpage;
}; };
/* Flags used by erofs_map_blocks() */ /* Flags used by erofs_map_blocks_flatmode() */
#define EROFS_GET_BLOCKS_RAW 0x0001 #define EROFS_GET_BLOCKS_RAW 0x0001
/* zmap.c */ /* zmap.c */
@ -358,8 +358,6 @@ static inline int z_erofs_map_blocks_iter(struct inode *inode,
/* data.c */ /* data.c */
struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr); struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr);
int erofs_map_blocks(struct inode *, struct erofs_map_blocks *, int);
/* inode.c */ /* inode.c */
static inline unsigned long erofs_inode_hash(erofs_nid_t nid) static inline unsigned long erofs_inode_hash(erofs_nid_t nid)
{ {