xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: add ext4_sb_block_valid() refactored out of ext4_inode_block_valid()

Browse Source 
commit 6bc6c2bdf1baca6522b8d9ba976257d722423085 upstream.

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>
Link: https://lore.kernel.org/r/dd34a236543ad5ae7123eeebe0cb69e6bdd44f34.1644992610.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ritesh Harjani
2022-02-16 12:32:49 +05:30
committed by Greg Kroah-Hartman
parent 9cd21f5bab
commit 65061f49a5
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/ext4/block_validity.c
View File

@@ -294,15 +294,10 @@ void ext4_release_system_zone(struct super_block *sb)
call_rcu(&system_blks->rcu, ext4_destroy_system_zone); call_rcu(&system_blks->rcu, ext4_destroy_system_zone);
} }
/* int ext4_sb_block_valid(struct super_block *sb, struct inode *inode,
* Returns 1 if the passed-in block region (start_blk, ext4_fsblk_t start_blk, unsigned int count)
* 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)
{ {
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_blocks *system_blks;
struct ext4_system_zone *entry; struct ext4_system_zone *entry;
struct rb_node *n; struct rb_node *n;
@@ -331,7 +326,9 @@ int ext4_inode_block_valid(struct inode *inode, ext4_fsblk_t start_blk,
else if (start_blk >= (entry->start_blk + entry->count)) else if (start_blk >= (entry->start_blk + entry->count))
n = n->rb_right; n = n->rb_right;
else { else {
ret = (entry->ino == inode->i_ino); ret = 0;
if (inode)
ret = (entry->ino == inode->i_ino);
break; break;
} }
} }
@@ -340,6 +337,17 @@ out_rcu:
return ret; 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, int ext4_check_blockref(const char *function, unsigned int line,
struct inode *inode, __le32 *p, unsigned int max) struct inode *inode, __le32 *p, unsigned int max)
{ {

3
fs/ext4/ext4.h
View File

@@ -3536,6 +3536,9 @@ extern int ext4_inode_block_valid(struct inode *inode,
unsigned int count); unsigned int count);
extern int ext4_check_blockref(const char *, unsigned int, extern int ext4_check_blockref(const char *, unsigned int,
struct inode *, __le32 *, 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 */ /* extents.c */
struct ext4_ext_path; struct ext4_ext_path;