From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Sheng-Hui Subject: [PATCH] f2fs: check the search bound earlier in dir.c/room_for_filename Date: Sun, 07 Jul 2013 17:10:00 +0800 Message-ID: <51D93068.3080606@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit To: jaegeuk.kim@samsung.com, linux-fsdevel@vger.kernel.org Return-path: Received: from mail-pb0-f51.google.com ([209.85.160.51]:44446 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751700Ab3GGJKJ (ORCPT ); Sun, 7 Jul 2013 05:10:09 -0400 Received: by mail-pb0-f51.google.com with SMTP id um15so3316612pbc.38 for ; Sun, 07 Jul 2013 02:10:09 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Check the bound earlier than computing the next search start pos. Signed-off-by: Wang Sheng-Hui --- 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; } -- 1.7.10.4