f2fs: inline: fix minor bugs in f2fs_recover_inline_data
cover f2fs: inline: fix minor bugs in f2fs_recover_inline_data
Jack Qiu (3):
f2fs: inline: correct comment in f2fs_recover_inline_data
f2fs: inline: set FI_DATA_EXIST improperly
f2fs: inline: fix wrong inline inode stat
fs/f2fs/inline.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
--
2.17.1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 1/3 f2fs: inline: correct comment in f2fs_recover_inline_data
In 3rd scene, it should remove data blocks instead of inline_data.
--- fs/f2fs/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/inline.c +1 -1
@@ -266,7 +266,7 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage)* [prev.] [next] of inline_data flag * o o -> recover inline_data * o x -> remove inline_data, and then recover data blocks -* x o -> remove inline_data, and then recover inline_data +* x o -> remove data blocks, and then recover inline_data * x x -> recover data blocks */ if (IS_INODE (npage))
--
2.17.1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment in f2fs_recover_inline_data
Quoted 3 lines · Jack Qiu
In 3rd scene, it should remove data blocks instead of
inline_data.Signed-off-by Jack Qiu <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 2/3 f2fs: inline: set FI_DATA_EXIST improperly
In reply to Jack QiuOnly set FI_DATA_EXIST when f2fs_inode has F2FS_DATA_EXIST.
--- fs/f2fs/inline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/inline.c +2 -1
@@ -286,7 +286,8 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage)memcpy (dst_addr, src_addr,MAX_INLINE_DATA (inode));set_inode_flag (inode,FI_INLINE_DATA ); -set_inode_flag (inode,FI_DATA_EXIST ); +if (ri->i_inline &F2FS_DATA_EXIST ) +set_inode_flag (inode,FI_DATA_EXIST );set_page_dirty (ipage);f2fs_put_page (ipage,1 );
--
2.17.1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly
Quoted 12 lines · Jack Qiu
Only set
FI_DATA_EXISTwhenf2fs_inodehasF2FS_DATA_EXIST.Signed-off-by Jack Qiu <[email protected]>--- fs/f2fs/inline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/f2fs/inline.c +0
-0
fs/f2fs/inline.c int f2fs_recover_inline_data(struct inode *inode, struct page *npage) · line 290
Quoted 6 lines
fs/f2fs/inline.c +2
-1@@ -286,7 +286,8 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage)memcpy (dst_addr, src_addr,MAX_INLINE_DATA (inode));set_inode_flag (inode,FI_INLINE_DATA ); -set_inode_flag (inode,FI_DATA_EXIST ); +if (ri->i_inline &F2FS_DATA_EXIST ) +set_inode_flag (inode,FI_DATA_EXIST );
This was done by recover_inline_flags(). it's fine to just remove set_inode_flag(FI_DATA_EXIST)?
Thanks,
Quoted 8 lines
fs/f2fs/inline.c +0
-1set_page_dirty (ipage);f2fs_put_page (ipage,1 ); --2.17.1
Quoted 6 lines
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
.
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 3/3 f2fs: inline: fix wrong inline inode stat
In reply to Jack QiuMiss to stat inline inode in f2fs_recover_inline_data.
--- fs/f2fs/inline.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/inline.c +2 -0
@@ -299,6 +299,7 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage)if (IS_ERR (ipage))return PTR_ERR (ipage);f2fs_truncate_inline_inode (inode, ipage,0 ); +stat_dec_inline_inode (inode);clear_inode_flag (inode,FI_INLINE_DATA );f2fs_put_page (ipage,1 ); }else if (ri && (ri->i_inline &F2FS_INLINE_DATA )) {
@@ -307,6 +308,7 @@ int f2fs_recover_inline_data(struct inode *inode, struct page *npage) ret =f2fs_truncate_blocks (inode,0 , false);if (ret)return ret; +stat_inc_inline_inode (inode); goto process_inline; }return 0 ;
--
2.17.1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 3/3] f2fs: inline: fix wrong inline inode stat
Quoted 3 lines · Jack Qiu
Miss to stat inline inode in
f2fs_recover_inline_data.Signed-off-by Jack Qiu <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel