linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 3/7] f2fs-tools: fix end block addres when finding free block
Date: Wed,  2 Nov 2016 22:28:42 -0700	[thread overview]
Message-ID: <20161103052846.72244-3-jaegeuk@kernel.org> (raw)
In-Reply-To: <20161103052846.72244-1-jaegeuk@kernel.org>

This patch fixes wrong end_blkaddr condition for free block allocation.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fsck/mount.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fsck/mount.c b/fsck/mount.c
index 47bb529..879dd52 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1547,16 +1547,18 @@ void flush_sit_entries(struct f2fs_sb_info *sbi)
 
 int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, int type)
 {
+	struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi);
 	struct seg_entry *se;
 	u32 segno;
 	u64 offset;
 	int not_enough = 0;
+	u64 end_blkaddr = (get_sb(segment_count_main) <<
+			get_sb(log_blocks_per_seg)) + get_sb(main_blkaddr);
 
 	if (get_free_segments(sbi) <= SM_I(sbi)->reserved_segments + 1)
 		not_enough = 1;
 
-	while (*to >= SM_I(sbi)->main_blkaddr &&
-			*to < F2FS_RAW_SUPER(sbi)->block_count) {
+	while (*to >= SM_I(sbi)->main_blkaddr && *to < end_blkaddr) {
 		segno = GET_SEGNO(sbi, *to);
 		offset = OFFSET_IN_SEG(sbi, *to);
 
-- 
2.8.3


------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi

  parent reply	other threads:[~2016-11-03  5:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-03  5:28 [PATCH 1/7] defrag.f2fs: return error for no space case Jaegeuk Kim
2016-11-03  5:28 ` [PATCH 2/7] resize.f2fs: fix wrong end_blkaddr Jaegeuk Kim
2016-11-03  5:28 ` Jaegeuk Kim [this message]
2016-11-03  5:28 ` [PATCH 4/7] resize.f2fs: get latest free segments Jaegeuk Kim
2016-11-03  6:53   ` heyunlei
2016-11-03 17:26     ` Jaegeuk Kim
2016-11-03 17:36     ` Jaegeuk Kim
2016-11-03  5:28 ` [PATCH 5/7] sload.f2fs: not support to find or add files in inline_dir directory Jaegeuk Kim
2016-11-03  5:28 ` [PATCH 6/7] f2fs-tools: determine cp_addr by sbi->cur_cp Jaegeuk Kim
2016-11-03  5:28 ` [PATCH 7/7] resize.f2fs: fill zeros for expanded ssa area Jaegeuk Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161103052846.72244-3-jaegeuk@kernel.org \
    --to=jaegeuk@kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).