On 2013年07月07日 17:10, Wang Sheng-Hui wrote:
Check the bound earlier than computing the next search start pos.
Signed-off-by: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
---
fs/f2fs/dir.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 9d1cd42..83a3549 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -406,13 +406,17 @@ next:
zero_end = find_next_bit_le(&dentry_blk->dentry_bitmap,
NR_DENTRY_IN_BLOCK,
zero_start);
+ if (zero_end >= NR_DENTRY_IN_BLOCK)
+ zero_end = NR_DENTRY_IN_BLOCK;
+
if (zero_end - zero_start >= slots)
return zero_start;
+ if (zero_end >= NR_DENTRY_IN_BLOCK)
+ return NR_DENTRY_IN_BLOCK;
+
bit_start = zero_end + 1;
- if (zero_end + 1 >= NR_DENTRY_IN_BLOCK)
- return NR_DENTRY_IN_BLOCK;
goto next;
}
Sorry, paste the wrong one. Please check the following patch.
Thanks,
From cda0fe2ebdd2d5afe2324c567444fc6329f98d6d Mon Sep 17 00:00:00 2001
From: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
Date: Sun, 7 Jul 2013 17:15:54 +0800
Subject: [PATCH] f2fs: check the search bound earlier in dir.c/room_for_filename
Check the bound earlier than computing the next search start pos.
Signed-off-by: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
---
fs/f2fs/dir.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 9d1cd42..cc405c5 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -406,12 +406,14 @@ next:
zero_end = find_next_bit_le(&dentry_blk->dentry_bitmap,
NR_DENTRY_IN_BLOCK,
zero_start);
+ if (zero_end >= NR_DENTRY_IN_BLOCK)
+ zero_end = NR_DENTRY_IN_BLOCK;
+
if (zero_end - zero_start >= slots)
return zero_start;
bit_start = zero_end + 1;
-
- if (zero_end + 1 >= NR_DENTRY_IN_BLOCK)
+ if (bit_start >= NR_DENTRY_IN_BLOCK)
return NR_DENTRY_IN_BLOCK;
goto next;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
