| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230209120409.000030a0.zbestahu@gmail.com>
Date: Thu, 9 Feb 2023 12:04:09 +0800
From: Yue Hu <zbestahu@...il.com>
To: Jingbo Xu <jefflexu@...ux.alibaba.com>
Cc: xiang@...nel.org, chao@...nel.org, linux-erofs@...ts.ozlabs.org,
linux-kernel@...r.kernel.org, huyue2@...lpad.com,
zhangwen@...lpad.com
Subject: Re: [PATCH v3 2/2] erofs: remove unused EROFS_GET_BLOCKS_RAW flag
On Thu, 9 Feb 2023 10:48:25 +0800
Jingbo Xu <jefflexu@...ux.alibaba.com> wrote:
> For erofs_map_blocks() and erofs_map_blocks_flatmode(), the flags
> argument is always EROFS_GET_BLOCKS_RAW. Thus remove the unused flags
> parameter for these two functions.
>
> Besides EROFS_GET_BLOCKS_RAW is originally introduced for reading
> compressed (raw) data for compressed files. However it's never used
> actually and let's remove it now.
>
> Signed-off-by: Jingbo Xu <jefflexu@...ux.alibaba.com>
Reviewed-by: Yue Hu <huyue2@...lpad.com>
> ---
> fs/erofs/data.c | 14 ++++++--------
> fs/erofs/fscache.c | 2 +-
> fs/erofs/internal.h | 10 ++++------
> include/trace/events/erofs.h | 1 -
> 4 files changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
> index 2713257ee718..032e12dccb84 100644
> --- a/fs/erofs/data.c
> +++ b/fs/erofs/data.c
> @@ -74,8 +74,7 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
> }
>
> static int erofs_map_blocks_flatmode(struct inode *inode,
> - struct erofs_map_blocks *map,
> - int flags)
> + struct erofs_map_blocks *map)
> {
> erofs_blk_t nblocks, lastblk;
> u64 offset = map->m_la;
> @@ -114,8 +113,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode,
> return 0;
> }
>
> -int erofs_map_blocks(struct inode *inode,
> - struct erofs_map_blocks *map, int flags)
> +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map)
> {
> struct super_block *sb = inode->i_sb;
> struct erofs_inode *vi = EROFS_I(inode);
> @@ -127,7 +125,7 @@ int erofs_map_blocks(struct inode *inode,
> void *kaddr;
> int err = 0;
>
> - trace_erofs_map_blocks_enter(inode, map, flags);
> + trace_erofs_map_blocks_enter(inode, map, 0);
> map->m_deviceid = 0;
> if (map->m_la >= inode->i_size) {
> /* leave out-of-bound access unmapped */
> @@ -137,7 +135,7 @@ int erofs_map_blocks(struct inode *inode,
> }
>
> if (vi->datalayout != EROFS_INODE_CHUNK_BASED) {
> - err = erofs_map_blocks_flatmode(inode, map, flags);
> + err = erofs_map_blocks_flatmode(inode, map);
> goto out;
> }
>
> @@ -189,7 +187,7 @@ int erofs_map_blocks(struct inode *inode,
> out:
> if (!err)
> map->m_llen = map->m_plen;
> - trace_erofs_map_blocks_exit(inode, map, flags, 0);
> + trace_erofs_map_blocks_exit(inode, map, 0, err);
> return err;
> }
>
> @@ -252,7 +250,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
> map.m_la = offset;
> map.m_llen = length;
>
> - ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);
> + ret = erofs_map_blocks(inode, &map);
> if (ret < 0)
> return ret;
>
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index 03de4dc99302..9658cf8689d9 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -197,7 +197,7 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_request *primary)
> int ret;
>
> map.m_la = pos;
> - ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);
> + ret = erofs_map_blocks(inode, &map);
> if (ret)
> return ret;
>
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index 48a2f33de15a..8a6ae820cd6d 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -401,16 +401,15 @@ struct erofs_map_blocks {
> unsigned int m_flags;
> };
>
> -#define EROFS_GET_BLOCKS_RAW 0x0001
> /*
> * Used to get the exact decompressed length, e.g. fiemap (consider lookback
> * approach instead if possible since it's more metadata lightweight.)
> */
> -#define EROFS_GET_BLOCKS_FIEMAP 0x0002
> +#define EROFS_GET_BLOCKS_FIEMAP 0x0001
> /* Used to map the whole extent if non-negligible data is requested for LZMA */
> -#define EROFS_GET_BLOCKS_READMORE 0x0004
> +#define EROFS_GET_BLOCKS_READMORE 0x0002
> /* Used to map tail extent for tailpacking inline or fragment pcluster */
> -#define EROFS_GET_BLOCKS_FINDTAIL 0x0008
> +#define EROFS_GET_BLOCKS_FINDTAIL 0x0004
>
> enum {
> Z_EROFS_COMPRESSION_SHIFTED = Z_EROFS_COMPRESSION_MAX,
> @@ -458,8 +457,7 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
> int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);
> int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> u64 start, u64 len);
> -int erofs_map_blocks(struct inode *inode,
> - struct erofs_map_blocks *map, int flags);
> +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map);
> struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid);
> int erofs_getattr(struct user_namespace *mnt_userns, const struct path *path,
> struct kstat *stat, u32 request_mask,
> diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h
> index f0e43e40a4a1..cf4a0d28b178 100644
> --- a/include/trace/events/erofs.h
> +++ b/include/trace/events/erofs.h
> @@ -19,7 +19,6 @@ struct erofs_map_blocks;
> { 1, "DIR" })
>
> #define show_map_flags(flags) __print_flags(flags, "|", \
> - { EROFS_GET_BLOCKS_RAW, "RAW" }, \
> { EROFS_GET_BLOCKS_FIEMAP, "FIEMAP" }, \
> { EROFS_GET_BLOCKS_READMORE, "READMORE" }, \
> { EROFS_GET_BLOCKS_FINDTAIL, "FINDTAIL" })
Powered by blists - more mailing lists