* [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status
@ 2015-01-06 6:28 Chao Yu
2015-01-06 19:32 ` Jaegeuk Kim
0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2015-01-06 6:28 UTC (permalink / raw)
To: Jaegeuk Kim, Changman Lee; +Cc: linux-f2fs-devel, linux-kernel
We use kzalloc to allocate memory in __recover_inline_status, and use this
all-zero memory to check the inline date content of inode page by comparing
them. This is low effective and not needed, let's check inline date content
directly.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
---
fs/f2fs/inode.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 3a8958d..8be0fd5 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -67,29 +67,25 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
}
}
-static int __recover_inline_status(struct inode *inode, struct page *ipage)
+static void __recover_inline_status(struct inode *inode, struct page *ipage)
{
void *inline_data = inline_data_addr(ipage);
+ __le32 *start = inline_data;
+ __le32 *end = start + MAX_INLINE_DATA / sizeof(__le32);
struct f2fs_inode *ri;
- void *zbuf;
-
- zbuf = kzalloc(MAX_INLINE_DATA, GFP_NOFS);
- if (!zbuf)
- return -ENOMEM;
-
- if (!memcmp(zbuf, inline_data, MAX_INLINE_DATA)) {
- kfree(zbuf);
- return 0;
- }
- kfree(zbuf);
+ while (start < end)
+ if (*start++)
+ goto recover;
+ return;
+recover:
f2fs_wait_on_page_writeback(ipage, NODE);
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
ri = F2FS_INODE(ipage);
set_raw_inline(F2FS_I(inode), ri);
set_page_dirty(ipage);
- return 0;
+ return;
}
static int do_read_inode(struct inode *inode)
@@ -98,7 +94,6 @@ static int do_read_inode(struct inode *inode)
struct f2fs_inode_info *fi = F2FS_I(inode);
struct page *node_page;
struct f2fs_inode *ri;
- int err = 0;
/* Check if ino is within scope */
if (check_nid_range(sbi, inode->i_ino)) {
@@ -142,7 +137,7 @@ static int do_read_inode(struct inode *inode)
/* check data exist */
if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
- err = __recover_inline_status(inode, node_page);
+ __recover_inline_status(inode, node_page);
/* get rdev by using inline_info */
__get_inode_rdev(inode, ri);
@@ -152,7 +147,7 @@ static int do_read_inode(struct inode *inode)
stat_inc_inline_inode(inode);
stat_inc_inline_dir(inode);
- return err;
+ return 0;
}
struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
--
2.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status
2015-01-06 6:28 [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status Chao Yu
@ 2015-01-06 19:32 ` Jaegeuk Kim
2015-01-10 12:06 ` Chao Yu
0 siblings, 1 reply; 3+ messages in thread
From: Jaegeuk Kim @ 2015-01-06 19:32 UTC (permalink / raw)
To: Chao Yu; +Cc: Changman Lee, linux-f2fs-devel, linux-kernel
Hi Chao,
On Tue, Jan 06, 2015 at 02:28:43PM +0800, Chao Yu wrote:
> We use kzalloc to allocate memory in __recover_inline_status, and use this
> all-zero memory to check the inline date content of inode page by comparing
> them. This is low effective and not needed, let's check inline date content
> directly.
>
> Signed-off-by: Chao Yu <chao2.yu@samsung.com>
> ---
> fs/f2fs/inode.c | 27 +++++++++++----------------
> 1 file changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
> index 3a8958d..8be0fd5 100644
> --- a/fs/f2fs/inode.c
> +++ b/fs/f2fs/inode.c
> @@ -67,29 +67,25 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)
> }
> }
>
> -static int __recover_inline_status(struct inode *inode, struct page *ipage)
> +static void __recover_inline_status(struct inode *inode, struct page *ipage)
> {
> void *inline_data = inline_data_addr(ipage);
> + __le32 *start = inline_data;
> + __le32 *end = start + MAX_INLINE_DATA / sizeof(__le32);
> struct f2fs_inode *ri;
> - void *zbuf;
> -
> - zbuf = kzalloc(MAX_INLINE_DATA, GFP_NOFS);
> - if (!zbuf)
> - return -ENOMEM;
> -
> - if (!memcmp(zbuf, inline_data, MAX_INLINE_DATA)) {
> - kfree(zbuf);
> - return 0;
> - }
> - kfree(zbuf);
>
> + while (start < end)
> + if (*start++)
> + goto recover;
> + return;
> +recover:
> f2fs_wait_on_page_writeback(ipage, NODE);
> set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
>
> ri = F2FS_INODE(ipage);
> set_raw_inline(F2FS_I(inode), ri);
> set_page_dirty(ipage);
> - return 0;
> + return;
> }
I think *goto recovery* is not a good way.
How's like this?
If you don't mind, I'll merge the patch with this.
static void __recover_inline_status(struct inode *inode, struct page *ipage)
{
void *inline_data = inline_data_addr(ipage);
__le32 *start = inline_data;
__le32 *end = start + MAX_INLINE_DATA / sizeof(__le32);
while (start < end) {
if (*start++) {
f2fs_wait_on_page_writeback(ipage, NODE);
set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);
set_raw_inline(F2FS_I(inode), F2FS_INODE(ipage));
set_page_dirty(ipage);
return;
}
}
return;
}
Thanks,
>
> static int do_read_inode(struct inode *inode)
> @@ -98,7 +94,6 @@ static int do_read_inode(struct inode *inode)
> struct f2fs_inode_info *fi = F2FS_I(inode);
> struct page *node_page;
> struct f2fs_inode *ri;
> - int err = 0;
>
> /* Check if ino is within scope */
> if (check_nid_range(sbi, inode->i_ino)) {
> @@ -142,7 +137,7 @@ static int do_read_inode(struct inode *inode)
>
> /* check data exist */
> if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
> - err = __recover_inline_status(inode, node_page);
> + __recover_inline_status(inode, node_page);
>
> /* get rdev by using inline_info */
> __get_inode_rdev(inode, ri);
> @@ -152,7 +147,7 @@ static int do_read_inode(struct inode *inode)
> stat_inc_inline_inode(inode);
> stat_inc_inline_dir(inode);
>
> - return err;
> + return 0;
> }
>
> struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
> --
> 2.2.1
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status
2015-01-06 19:32 ` Jaegeuk Kim
@ 2015-01-10 12:06 ` Chao Yu
0 siblings, 0 replies; 3+ messages in thread
From: Chao Yu @ 2015-01-10 12:06 UTC (permalink / raw)
To: 'Jaegeuk Kim'
Cc: 'Changman Lee', linux-f2fs-devel, linux-kernel
Hi,
> -----Original Message-----
> From: Jaegeuk Kim [mailto:jaegeuk@kernel.org]
> Sent: Wednesday, January 07, 2015 3:32 AM
> To: Chao Yu
> Cc: Changman Lee; linux-f2fs-devel@lists.sourceforge.net; linux-kernel@vger.kernel.org
> Subject: Re: [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status
>
> Hi Chao,
>
> On Tue, Jan 06, 2015 at 02:28:43PM +0800, Chao Yu wrote:
> > We use kzalloc to allocate memory in __recover_inline_status, and use this
> > all-zero memory to check the inline date content of inode page by comparing
> > them. This is low effective and not needed, let's check inline date content
> > directly.
> >
[snip]
>
> I think *goto recovery* is not a good way.
>
> How's like this?
> If you don't mind, I'll merge the patch with this.
It's OK, thank you!
Regards,
Yu
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-10 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-06 6:28 [f2fs-dev][PATCH 1/2] f2fs: get rid of kzalloc in __recover_inline_status Chao Yu
2015-01-06 19:32 ` Jaegeuk Kim
2015-01-10 12:06 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox