From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753500AbcJKOgM (ORCPT ); Tue, 11 Oct 2016 10:36:12 -0400 Received: from mail.kernel.org ([198.145.29.136]:58636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672AbcJKOgK (ORCPT ); Tue, 11 Oct 2016 10:36:10 -0400 From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 7/7] f2fs: avoid casted negative value as shrink count Date: Tue, 11 Oct 2016 22:31:36 +0800 Message-Id: <20161011143136.2107-7-chao@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161011143136.2107-1-chao@kernel.org> References: <20161011143136.2107-1-chao@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu This patch makes sure it returns a positive value instead of a probable casted negative value as shrink count. Signed-off-by: Chao Yu --- fs/f2fs/shrinker.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c index 8b0a112..e1220f2 100644 --- a/fs/f2fs/shrinker.c +++ b/fs/f2fs/shrinker.c @@ -21,14 +21,16 @@ static unsigned int shrinker_run_no; static unsigned long __count_nat_entries(struct f2fs_sb_info *sbi) { - return NM_I(sbi)->nat_cnt - NM_I(sbi)->dirty_nat_cnt; + long count = NM_I(sbi)->nat_cnt - NM_I(sbi)->dirty_nat_cnt; + + return count > 0 ? count : 0; } static unsigned long __count_free_nids(struct f2fs_sb_info *sbi) { - if (NM_I(sbi)->free_nid_cnt > MAX_FREE_NIDS) - return NM_I(sbi)->free_nid_cnt - MAX_FREE_NIDS; - return 0; + long count = NM_I(sbi)->free_nid_cnt - MAX_FREE_NIDS; + + return count > 0 ? count : 0; } static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi) -- 2.10.1