* [f2fs-dev] [PATCH 0/3] f2fs: inline: fix minor bugs in f2fs_recover_inline_data
@ 2020-12-05 7:40 Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment " Jack Qiu
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jack Qiu @ 2020-12-05 7:40 UTC (permalink / raw)
To: linux-f2fs-devel
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
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment in f2fs_recover_inline_data
2020-12-05 7:40 [f2fs-dev] [PATCH 0/3] f2fs: inline: fix minor bugs in f2fs_recover_inline_data Jack Qiu
@ 2020-12-05 7:40 ` Jack Qiu
2020-12-07 7:08 ` Chao Yu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 3/3] f2fs: inline: fix wrong inline inode stat Jack Qiu
2 siblings, 1 reply; 8+ messages in thread
From: Jack Qiu @ 2020-12-05 7:40 UTC (permalink / raw)
To: linux-f2fs-devel
In 3rd scene, it should remove data blocks instead of inline_data.
Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
---
fs/f2fs/inline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 70384e31788d..0399531efcd3 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -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
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly
2020-12-05 7:40 [f2fs-dev] [PATCH 0/3] f2fs: inline: fix minor bugs in f2fs_recover_inline_data Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment " Jack Qiu
@ 2020-12-05 7:40 ` Jack Qiu
2020-12-07 7:14 ` Chao Yu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 3/3] f2fs: inline: fix wrong inline inode stat Jack Qiu
2 siblings, 1 reply; 8+ messages in thread
From: Jack Qiu @ 2020-12-05 7:40 UTC (permalink / raw)
To: linux-f2fs-devel
Only set FI_DATA_EXIST when f2fs_inode has F2FS_DATA_EXIST.
Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
---
fs/f2fs/inline.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 0399531efcd3..4ee5b5510593 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -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
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly
2020-12-05 7:40 ` [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly Jack Qiu
@ 2020-12-07 7:14 ` Chao Yu
0 siblings, 0 replies; 8+ messages in thread
From: Chao Yu @ 2020-12-07 7:14 UTC (permalink / raw)
To: Jack Qiu, linux-f2fs-devel
On 2020/12/5 15:40, Jack Qiu wrote:
> Only set FI_DATA_EXIST when f2fs_inode has F2FS_DATA_EXIST.
>
> Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
> ---
> fs/f2fs/inline.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
> index 0399531efcd3..4ee5b5510593 100644
> --- a/fs/f2fs/inline.c
> +++ b/fs/f2fs/inline.c
> @@ -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,
>
> set_page_dirty(ipage);
> f2fs_put_page(ipage, 1);
> --
> 2.17.1
>
>
>
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
> .
>
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [f2fs-dev] [PATCH 3/3] f2fs: inline: fix wrong inline inode stat
2020-12-05 7:40 [f2fs-dev] [PATCH 0/3] f2fs: inline: fix minor bugs in f2fs_recover_inline_data Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment " Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly Jack Qiu
@ 2020-12-05 7:40 ` Jack Qiu
2020-12-07 7:18 ` Chao Yu
2 siblings, 1 reply; 8+ messages in thread
From: Jack Qiu @ 2020-12-05 7:40 UTC (permalink / raw)
To: linux-f2fs-devel
Miss to stat inline inode in f2fs_recover_inline_data.
Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
---
fs/f2fs/inline.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 4ee5b5510593..a35effbe77ed 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -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
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly
@ 2020-12-07 9:02 Qiujie (Jack)
0 siblings, 0 replies; 8+ messages in thread
From: Qiujie (Jack) @ 2020-12-07 9:02 UTC (permalink / raw)
To: Yuchao (T), linux-f2fs-devel@lists.sourceforge.net
> On 2020/12/5 15:40, Jack Qiu wrote:
> > Only set FI_DATA_EXIST when f2fs_inode has F2FS_DATA_EXIST.
> >
> > Signed-off-by: Jack Qiu <jack.qiu@huawei.com>
> > ---
> > fs/f2fs/inline.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index
> > 0399531efcd3..4ee5b5510593 100644
> > --- a/fs/f2fs/inline.c
> > +++ b/fs/f2fs/inline.c
> > @@ -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)?
Agreed, will fix in V2.
> Thanks,
>
> >
> > set_page_dirty(ipage);
> > f2fs_put_page(ipage, 1);
> > --
> > 2.17.1
> >
> >
> >
> > _______________________________________________
> > Linux-f2fs-devel mailing list
> > Linux-f2fs-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
> > .
> >
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-07 9:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-05 7:40 [f2fs-dev] [PATCH 0/3] f2fs: inline: fix minor bugs in f2fs_recover_inline_data Jack Qiu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 1/3] f2fs: inline: correct comment " Jack Qiu
2020-12-07 7:08 ` Chao Yu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly Jack Qiu
2020-12-07 7:14 ` Chao Yu
2020-12-05 7:40 ` [f2fs-dev] [PATCH 3/3] f2fs: inline: fix wrong inline inode stat Jack Qiu
2020-12-07 7:18 ` Chao Yu
-- strict thread matches above, loose matches on Subject: below --
2020-12-07 9:02 [f2fs-dev] [PATCH 2/3] f2fs: inline: set FI_DATA_EXIST improperly Qiujie (Jack)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).