diff options
| author | Gao Xiang <hsiangkao@linux.alibaba.com> | 2023-04-13 17:22:41 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2023-04-17 01:15:53 +0800 |
| commit | 4fdadd5b0f0c723c812842454f8cca1619f2e731 (patch) | |
| tree | d277420257ea7833f8f24f381b5f65681a4d43a0 /fs/erofs/inode.c | |
| parent | 6a318ccd7e083729cbcdbd174d7070f6b7d24130 (diff) | |
erofs: get rid of z_erofs_fill_inode()
Prior to big pclusters, non-compact compression indexes could have
empty headers.
Let's just avoid the legacy path since it can be handled properly
as a specific compression header with z_erofs_fill_inode_lazy() too.
Tested with erofs-utils exist versions.
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Yue Hu <huyue2@coolpad.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230413092241.73829-1-hsiangkao@linux.alibaba.com
Diffstat (limited to 'fs/erofs/inode.c')
| -rw-r--r-- | fs/erofs/inode.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 7ca9aafb7471..e196d453291b 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -291,11 +291,15 @@ static int erofs_fill_inode(struct inode *inode) } if (erofs_inode_is_data_compressed(vi->datalayout)) { +#ifdef CONFIG_EROFS_FS_ZIP if (!erofs_is_fscache_mode(inode->i_sb) && - inode->i_sb->s_blocksize_bits == PAGE_SHIFT) - err = z_erofs_fill_inode(inode); - else - err = -EOPNOTSUPP; + inode->i_sb->s_blocksize_bits == PAGE_SHIFT) { + inode->i_mapping->a_ops = &z_erofs_aops; + err = 0; + goto out_unlock; + } +#endif + err = -EOPNOTSUPP; goto out_unlock; } inode->i_mapping->a_ops = &erofs_raw_access_aops; |