| Message ID | 1c5fae30be49b5116e4e5604e6224b33b778feaf.1644062450.git.riteshh@linux.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ext4: fast_commit fixes, stricter block checking & cleanups | expand |
On Sat 05-02-22 19:39:56, Ritesh Harjani wrote: > This API will be needed at places where we don't have an inode > for e.g. while freeing blocks in ext4_group_add_blocks() > > Suggested-by: Jan Kara <jack@suse.cz> > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> ... > @@ -329,7 +324,8 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, > else if (start_blk >= (entry->start_blk + entry->count)) > n = n->rb_right; > else { > - ret = (entry->ino == inode->i_ino); > + if (inode) > + ret = (entry->ino == inode->i_ino); > break; In case inode is not passed, we must not overlap any entry in the rbtree. So we should return 0, not 1. Honza
On 22/02/07 05:42PM, Jan Kara wrote: > On Sat 05-02-22 19:39:56, Ritesh Harjani wrote: > > This API will be needed at places where we don't have an inode > > for e.g. while freeing blocks in ext4_group_add_blocks() > > > > Suggested-by: Jan Kara <jack@suse.cz> > > Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> > > ... > > > @@ -329,7 +324,8 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, > > else if (start_blk >= (entry->start_blk + entry->count)) > > n = n->rb_right; > > else { > > - ret = (entry->ino == inode->i_ino); > > + if (inode) > > + ret = (entry->ino == inode->i_ino); > > break; > > In case inode is not passed, we must not overlap any entry in the rbtree. > So we should return 0, not 1. > Damm! Thanks for catching that. Don't know how did I miss that. Will make this below change then. else { ret = 0; if (inode) ret = (entry->ino == inode->i_ino) break; } -riteshh > Honza > -- > Jan Kara <jack@suse.com> > SUSE Labs, CR
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 4666b55b736e..a9195d5ac1e7 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -292,15 +292,10 @@ void ext4_release_system_zone(struct super_block *sb) call_rcu(&system_blks->rcu, ext4_destroy_system_zone); } -/* - * Returns 1 if the passed-in block region (start_blk, - * start_blk+count) is valid; 0 if some part of the block region - * overlaps with some other filesystem metadata blocks. - */ -int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, - unsigned int count) +int ext4_sb_block_valid(struct super_block *sb, struct inode *inode, + ext4_fsblk_t start_blk, unsigned int count) { - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); + struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_system_blocks *system_blks; struct ext4_system_zone *entry; struct rb_node *n; @@ -329,7 +324,8 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, else if (start_blk >= (entry->start_blk + entry->count)) n = n->rb_right; else { - ret = (entry->ino == inode->i_ino); + if (inode) + ret = (entry->ino == inode->i_ino); break; } } @@ -338,6 +334,17 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, return ret; } +/* + * Returns 1 if the passed-in block region (start_blk, + * start_blk+count) is valid; 0 if some part of the block region + * overlaps with some other filesystem metadata blocks. + */ +int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk, + unsigned int count) +{ + return ext4_sb_block_valid(inode->i_sb, inode, start_blk, count); +} + int ext4_check_blockref(const char *function, unsigned int line, struct inode *inode, __le32 *p, unsigned int max) { diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 8c1d0e352f47..4f7851c1e432 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3706,6 +3706,9 @@ extern int ext4_inode_block_valid(struct inode *inode, unsigned int count); extern int ext4_check_blockref(const char *, unsigned int, struct inode *, __le32 *, unsigned int); +extern int ext4_sb_block_valid(struct super_block *sb, struct inode *inode, + ext4_fsblk_t start_blk, unsigned int count); + /* extents.c */ struct ext4_ext_path;
This API will be needed at places where we don't have an inode for e.g. while freeing blocks in ext4_group_add_blocks() Suggested-by: Jan Kara <jack@suse.cz> Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> --- fs/ext4/block_validity.c | 25 ++++++++++++++++--------- fs/ext4/ext4.h | 3 +++ 2 files changed, 19 insertions(+), 9 deletions(-)