* [PATCH] defrag.f2fs: enhance allocation speed
@ 2015-12-18 22:13 Jaegeuk Kim
2015-12-19 9:44 ` Chao Yu
0 siblings, 1 reply; 3+ messages in thread
From: Jaegeuk Kim @ 2015-12-18 22:13 UTC (permalink / raw)
To: linux-f2fs-devel; +Cc: Jaegeuk Kim
This patch improves the allocation speed.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fsck/f2fs.h | 2 +-
fsck/mount.c | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index af5cc40..f990527 100644
--- a/fsck/f2fs.h
+++ b/fsck/f2fs.h
@@ -295,7 +295,7 @@ static inline block_t __end_block_addr(struct f2fs_sb_info *sbi)
#define GET_R2L_SEGNO(sbi, segno) (segno + FREE_I_START_SEGNO(sbi))
#define START_BLOCK(sbi, segno) (SM_I(sbi)->main_blkaddr + \
- (segno << sbi->log_blocks_per_seg))
+ ((segno) << sbi->log_blocks_per_seg))
static inline struct curseg_info *CURSEG_I(struct f2fs_sb_info *sbi, int type)
{
diff --git a/fsck/mount.c b/fsck/mount.c
index 4b38df8..82af895 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1401,9 +1401,11 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
se = get_seg_entry(sbi, segno);
if (se->valid_blocks == sbi->blocks_per_seg ||
- IS_CUR_SEGNO(sbi, segno, type))
- goto next;
-
+ IS_CUR_SEGNO(sbi, segno, type)) {
+ *to = left ? START_BLOCK(sbi, segno - 1) :
+ START_BLOCK(sbi, segno + 1);
+ continue;
+ }
if (se->valid_blocks == 0 && !(segno % sbi->segs_per_sec)) {
struct seg_entry *se2;
int i;
@@ -1420,7 +1422,7 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
if (se->type == type &&
!f2fs_test_bit(offset, (const char *)se->cur_valid_map))
return 0;
-next:
+
*to = left ? *to - 1: *to + 1;
}
return -1;
--
2.5.4 (Apple Git-61)
------------------------------------------------------------------------------
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] defrag.f2fs: enhance allocation speed
2015-12-18 22:13 [PATCH] defrag.f2fs: enhance allocation speed Jaegeuk Kim
@ 2015-12-19 9:44 ` Chao Yu
2015-12-19 11:26 ` Jaegeuk Kim
0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2015-12-19 9:44 UTC (permalink / raw)
To: Jaegeuk Kim, linux-f2fs-devel
Hi Jaegeuk,
On 12/19/15 6:13 AM, Jaegeuk Kim wrote:
> This patch improves the allocation speed.
>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fsck/f2fs.h | 2 +-
> fsck/mount.c | 10 ++++++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/fsck/f2fs.h b/fsck/f2fs.h
> index af5cc40..f990527 100644
> --- a/fsck/f2fs.h
> +++ b/fsck/f2fs.h
> @@ -295,7 +295,7 @@ static inline block_t __end_block_addr(struct f2fs_sb_info *sbi)
> #define GET_R2L_SEGNO(sbi, segno) (segno + FREE_I_START_SEGNO(sbi))
>
> #define START_BLOCK(sbi, segno) (SM_I(sbi)->main_blkaddr + \
> - (segno << sbi->log_blocks_per_seg))
> + ((segno) << sbi->log_blocks_per_seg))
>
> static inline struct curseg_info *CURSEG_I(struct f2fs_sb_info *sbi, int type)
> {
> diff --git a/fsck/mount.c b/fsck/mount.c
> index 4b38df8..82af895 100644
> --- a/fsck/mount.c
> +++ b/fsck/mount.c
> @@ -1401,9 +1401,11 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
> se = get_seg_entry(sbi, segno);
>
> if (se->valid_blocks == sbi->blocks_per_seg ||
> - IS_CUR_SEGNO(sbi, segno, type))
> - goto next;
> -
> + IS_CUR_SEGNO(sbi, segno, type)) {
> + *to = left ? START_BLOCK(sbi, segno - 1) :
When traversing leftward, shouldn't next position be
*to = left ? START_BLOCK(sbi, segno) - 1 : ?
Thanks,
> + START_BLOCK(sbi, segno + 1);
> + continue;
> + }
> if (se->valid_blocks == 0 && !(segno % sbi->segs_per_sec)) {
> struct seg_entry *se2;
> int i;
> @@ -1420,7 +1422,7 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
> if (se->type == type &&
> !f2fs_test_bit(offset, (const char *)se->cur_valid_map))
> return 0;
> -next:
> +
> *to = left ? *to - 1: *to + 1;
> }
> return -1;
>
------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] defrag.f2fs: enhance allocation speed
2015-12-19 9:44 ` Chao Yu
@ 2015-12-19 11:26 ` Jaegeuk Kim
0 siblings, 0 replies; 3+ messages in thread
From: Jaegeuk Kim @ 2015-12-19 11:26 UTC (permalink / raw)
To: Chao Yu; +Cc: linux-f2fs-devel
Hi Chao,
On Sat, Dec 19, 2015 at 05:44:45PM +0800, Chao Yu wrote:
> Hi Jaegeuk,
>
> On 12/19/15 6:13 AM, Jaegeuk Kim wrote:
> > This patch improves the allocation speed.
> >
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> > fsck/f2fs.h | 2 +-
> > fsck/mount.c | 10 ++++++----
> > 2 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/fsck/f2fs.h b/fsck/f2fs.h
> > index af5cc40..f990527 100644
> > --- a/fsck/f2fs.h
> > +++ b/fsck/f2fs.h
> > @@ -295,7 +295,7 @@ static inline block_t __end_block_addr(struct f2fs_sb_info *sbi)
> > #define GET_R2L_SEGNO(sbi, segno) (segno + FREE_I_START_SEGNO(sbi))
> >
> > #define START_BLOCK(sbi, segno) (SM_I(sbi)->main_blkaddr + \
> > - (segno << sbi->log_blocks_per_seg))
> > + ((segno) << sbi->log_blocks_per_seg))
> >
> > static inline struct curseg_info *CURSEG_I(struct f2fs_sb_info *sbi, int type)
> > {
> > diff --git a/fsck/mount.c b/fsck/mount.c
> > index 4b38df8..82af895 100644
> > --- a/fsck/mount.c
> > +++ b/fsck/mount.c
> > @@ -1401,9 +1401,11 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
> > se = get_seg_entry(sbi, segno);
> >
> > if (se->valid_blocks == sbi->blocks_per_seg ||
> > - IS_CUR_SEGNO(sbi, segno, type))
> > - goto next;
> > -
> > + IS_CUR_SEGNO(sbi, segno, type)) {
> > + *to = left ? START_BLOCK(sbi, segno - 1) :
>
> When traversing leftward, shouldn't next position be
>
> *to = left ? START_BLOCK(sbi, segno) - 1 : ?
Right. :)
Thanks,
>
> Thanks,
>
> > + START_BLOCK(sbi, segno + 1);
> > + continue;
> > + }
> > if (se->valid_blocks == 0 && !(segno % sbi->segs_per_sec)) {
> > struct seg_entry *se2;
> > int i;
> > @@ -1420,7 +1422,7 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
> > if (se->type == type &&
> > !f2fs_test_bit(offset, (const char *)se->cur_valid_map))
> > return 0;
> > -next:
> > +
> > *to = left ? *to - 1: *to + 1;
> > }
> > return -1;
> >
------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-19 11:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-18 22:13 [PATCH] defrag.f2fs: enhance allocation speed Jaegeuk Kim
2015-12-19 9:44 ` Chao Yu
2015-12-19 11:26 ` Jaegeuk Kim
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).