Messages in this thread | | | Date | Tue, 10 Mar 2020 09:18:38 -0700 | From | Jaegeuk Kim <> | Subject | Re: [PATCH] f2fs: fix to check i_compr_blocks correctly |
| |
On 03/10, Chao Yu wrote: > Hi Jaegeuk, > > On 2020-2-25 18:26, Chao Yu wrote: > > inode.i_blocks counts based on 512byte sector, we need to convert > > to 4kb sized block count before comparing to i_compr_blocks. > > > > In addition, add to print message when sanity check on inode > > compression configs failed. > > > > Signed-off-by: Chao Yu <yuchao0@huawei.com> > > --- > > fs/f2fs/inode.c | 23 ++++++++++++++++++++--- > > 1 file changed, 20 insertions(+), 3 deletions(-) > > > > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > > index 156cc5ef3044..299611562f7e 100644 > > --- a/fs/f2fs/inode.c > > +++ b/fs/f2fs/inode.c > > @@ -291,13 +291,30 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page) > > fi->i_flags & F2FS_COMPR_FL && > > F2FS_FITS_IN_INODE(ri, fi->i_extra_isize, > > i_log_cluster_size)) { > > - if (ri->i_compress_algorithm >= COMPRESS_MAX) > > + if (ri->i_compress_algorithm >= COMPRESS_MAX) { > > + f2fs_warn(sbi, "%s: inode (ino=%lx) has unsupported " > > + "compress algorithm: %u, run fsck to fix", > > + __func__, inode->i_ino, > > + ri->i_compress_algorithm); > > return false; > > - if (le64_to_cpu(ri->i_compr_blocks) > inode->i_blocks) > > + } > > + if (le64_to_cpu(ri->i_compr_blocks) > > > + SECTOR_TO_BLOCK(inode->i_blocks)) { > > + f2fs_warn(sbi, "%s: inode (ino=%lx) hash inconsistent " > > This is a typo: hash -> has > > Could you please manually fix this in your tree?
Done.
> > Thanks > > > + "i_compr_blocks:%llu, i_blocks:%llu, run fsck to fix", > > + __func__, inode->i_ino, > > + le64_to_cpu(ri->i_compr_blocks), > > + SECTOR_TO_BLOCK(inode->i_blocks)); > > return false; > > + } > > if (ri->i_log_cluster_size < MIN_COMPRESS_LOG_SIZE || > > - ri->i_log_cluster_size > MAX_COMPRESS_LOG_SIZE) > > + ri->i_log_cluster_size > MAX_COMPRESS_LOG_SIZE) { > > + f2fs_warn(sbi, "%s: inode (ino=%lx) has unsupported " > > + "log cluster size: %u, run fsck to fix", > > + __func__, inode->i_ino, > > + ri->i_log_cluster_size); > > return false; > > + } > > } > > > > return true; > >
| |