| Message ID | 20201127113405.26867-4-jack@suse.cz |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | ext4: Various fixes of ext4 handling of fs errors | expand |
On Nov 27, 2020, at 4:33 AM, Jan Kara <jack@suse.cz> wrote: > > We use __ext4_error() when ext4_protect_reserved_inode() finds > filesystem corruption. However EXT4_ERROR_INODE_ERR() is perfectly > capable of reporting all the needed information. So just use that. > > Signed-off-by: Jan Kara <jack@suse.cz> I'm not a big fan of EXT4_ERROR_INODE_ERR() vs. ext4_error_inode_err() and some of the error macros being upper-case vs. lower case, but that is not the fault of this patch... :-) Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/block_validity.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c > index 8e6ca23ed172..13ffda871227 100644 > --- a/fs/ext4/block_validity.c > +++ b/fs/ext4/block_validity.c > @@ -176,12 +176,10 @@ static int ext4_protect_reserved_inode(struct super_block *sb, > err = add_system_zone(system_blks, map.m_pblk, n, ino); > if (err < 0) { > if (err == -EFSCORRUPTED) { > - __ext4_error(sb, __func__, __LINE__, > - -err, map.m_pblk, > - "blocks %llu-%llu from inode %u overlap system zone", > - map.m_pblk, > - map.m_pblk + map.m_len - 1, > - ino); > + EXT4_ERROR_INODE_ERR(inode, -err, > + "blocks %llu-%llu from inode overlap system zone", > + map.m_pblk, > + map.m_pblk + map.m_len - 1); > } > break; > } > -- > 2.16.4 > Cheers, Andreas
On Fri, Nov 27, 2020 at 12:33:56PM +0100, Jan Kara wrote: > We use __ext4_error() when ext4_protect_reserved_inode() finds > filesystem corruption. However EXT4_ERROR_INODE_ERR() is perfectly > capable of reporting all the needed information. So just use that. > > Signed-off-by: Jan Kara <jack@suse.cz> Thanks, applied. - Ted
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 8e6ca23ed172..13ffda871227 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -176,12 +176,10 @@ static int ext4_protect_reserved_inode(struct super_block *sb, err = add_system_zone(system_blks, map.m_pblk, n, ino); if (err < 0) { if (err == -EFSCORRUPTED) { - __ext4_error(sb, __func__, __LINE__, - -err, map.m_pblk, - "blocks %llu-%llu from inode %u overlap system zone", - map.m_pblk, - map.m_pblk + map.m_len - 1, - ino); + EXT4_ERROR_INODE_ERR(inode, -err, + "blocks %llu-%llu from inode overlap system zone", + map.m_pblk, + map.m_pblk + map.m_len - 1); } break; }
We use __ext4_error() when ext4_protect_reserved_inode() finds filesystem corruption. However EXT4_ERROR_INODE_ERR() is perfectly capable of reporting all the needed information. So just use that. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/block_validity.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)