| Message ID | 20250506012009.3896990-3-yi.zhang@huaweicloud.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [v2,1/4] ext4: fix out of bounds punch offset | expand |
On 2025/5/6 9:20, Zhang Yi wrote: > From: Zhang Yi <yi.zhang@huawei.com> > > There are several locations that get the correct maxbytes value based on > the inode's block type. It would be beneficial to extract a common > helper function to make the code more clear. > > Signed-off-by: Zhang Yi <yi.zhang@huawei.com> > Reviewed-by: Jan Kara <jack@suse.cz> Nice cleanup! Looks good to me. Reviewed-by: Baokun Li <libaokun1@huawei.com> > --- > fs/ext4/ext4.h | 7 +++++++ > fs/ext4/extents.c | 7 +------ > fs/ext4/file.c | 7 +------ > 3 files changed, 9 insertions(+), 12 deletions(-) > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index 5a20e9cd7184..8664bb5367c5 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -3378,6 +3378,13 @@ static inline unsigned int ext4_flex_bg_size(struct ext4_sb_info *sbi) > return 1 << sbi->s_log_groups_per_flex; > } > > +static inline loff_t ext4_get_maxbytes(struct inode *inode) > +{ > + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) > + return inode->i_sb->s_maxbytes; > + return EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; > +} > + > #define ext4_std_error(sb, errno) \ > do { \ > if ((errno)) \ > diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c > index c616a16a9f36..b294d2f35a26 100644 > --- a/fs/ext4/extents.c > +++ b/fs/ext4/extents.c > @@ -4931,12 +4931,7 @@ static const struct iomap_ops ext4_iomap_xattr_ops = { > > static int ext4_fiemap_check_ranges(struct inode *inode, u64 start, u64 *len) > { > - u64 maxbytes; > - > - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) > - maxbytes = inode->i_sb->s_maxbytes; > - else > - maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; > + u64 maxbytes = ext4_get_maxbytes(inode); > > if (*len == 0) > return -EINVAL; > diff --git a/fs/ext4/file.c b/fs/ext4/file.c > index beb078ee4811..b845a25f7932 100644 > --- a/fs/ext4/file.c > +++ b/fs/ext4/file.c > @@ -929,12 +929,7 @@ static int ext4_file_open(struct inode *inode, struct file *filp) > loff_t ext4_llseek(struct file *file, loff_t offset, int whence) > { > struct inode *inode = file->f_mapping->host; > - loff_t maxbytes; > - > - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) > - maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; > - else > - maxbytes = inode->i_sb->s_maxbytes; > + loff_t maxbytes = ext4_get_maxbytes(inode); > > switch (whence) { > default:
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 5a20e9cd7184..8664bb5367c5 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3378,6 +3378,13 @@ static inline unsigned int ext4_flex_bg_size(struct ext4_sb_info *sbi) return 1 << sbi->s_log_groups_per_flex; } +static inline loff_t ext4_get_maxbytes(struct inode *inode) +{ + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + return inode->i_sb->s_maxbytes; + return EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; +} + #define ext4_std_error(sb, errno) \ do { \ if ((errno)) \ diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index c616a16a9f36..b294d2f35a26 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4931,12 +4931,7 @@ static const struct iomap_ops ext4_iomap_xattr_ops = { static int ext4_fiemap_check_ranges(struct inode *inode, u64 start, u64 *len) { - u64 maxbytes; - - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) - maxbytes = inode->i_sb->s_maxbytes; - else - maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; + u64 maxbytes = ext4_get_maxbytes(inode); if (*len == 0) return -EINVAL; diff --git a/fs/ext4/file.c b/fs/ext4/file.c index beb078ee4811..b845a25f7932 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -929,12 +929,7 @@ static int ext4_file_open(struct inode *inode, struct file *filp) loff_t ext4_llseek(struct file *file, loff_t offset, int whence) { struct inode *inode = file->f_mapping->host; - loff_t maxbytes; - - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) - maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; - else - maxbytes = inode->i_sb->s_maxbytes; + loff_t maxbytes = ext4_get_maxbytes(inode); switch (whence) { default: