From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751AbcAHMO2 (ORCPT ); Fri, 8 Jan 2016 07:14:28 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:40300 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750794AbcAHMO1 (ORCPT ); Fri, 8 Jan 2016 07:14:27 -0500 X-AuditID: cbfee61b-f793c6d00000236c-18-568fa81dabcd From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] f2fs: check node id earily when readaheading node page Date: Fri, 08 Jan 2016 20:13:37 +0800 Message-id: <005801d14a0e$1b2433d0$516c9b70$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFKDb7oWrvPd6p+QkSNqg8Jdoc1mg== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsVy+t9jAV3ZFf1hBj9X6lo8WT+L2eLSIneL y7vmsDkwe2xa1cnmsXvBZyaPz5vkApijuGxSUnMyy1KL9O0SuDLa769hLljLVbFiTmkD4xyO LkZODgkBE4nGNY3sELaYxIV769m6GLk4hASWMkqsW/0fLCEk8IpR4u78cBCbTUBFYnnHfyYQ WwTIPrToMlgNs4CHRGPHd1YQW1jAT+LVgy1sIDaLgKrEyZ9nwGp4BSwl1i1dBmULSvyYfI8F oldLYv3O40wQtrzE5jVvmSEOUpDYcfY1I8QuPYl1W18xQtSIS2w8cotlAqPALCSjZiEZNQvJ qFlIWhYwsqxilEgtSC4oTkrPNcpLLdcrTswtLs1L10vOz93ECA7hZ9I7GA/vcj/EKMDBqMTD y7GjL0yINbGsuDL3EKMEB7OSCO+apf1hQrwpiZVVqUX58UWlOanFhxilOViUxHn3XYoMExJI TyxJzU5NLUgtgskycXBKNTCarOkvUT72PEp020fe3rO/GwIdc059cff83Hn3+Wq1AwUzNraq FLQyPl+dIXmwYxqffh73ikbGsmXsBYtmb/hxOOFyzPqa/V8+SEtM+Hhl/7I2//y/G81mfIiN Mtrd15xbMT3FYw8jS7ecjMsV7wY9i6IF3jIbmy5v8d7T32Spm2hxWyT+jroSS3FGoqEWc1Fx IgBJG/tCXQIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add node id check in ra_node_page and get_node_page_ra like get_node_page. Signed-off-by: Chao Yu --- v2: - fix wrong title of commit log: NAT page -> node page. --- fs/f2fs/node.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 6d5f548..c1ddf3d 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1041,6 +1041,10 @@ void ra_node_page(struct f2fs_sb_info *sbi, nid_t nid) struct page *apage; int err; + if (!nid) + return; + f2fs_bug_on(sbi, check_nid_range(sbi, nid)); + apage = find_get_page(NODE_MAPPING(sbi), nid); if (apage && PageUptodate(apage)) { f2fs_put_page(apage, 0); @@ -1108,6 +1112,7 @@ struct page *get_node_page_ra(struct page *parent, int start) nid = get_nid(parent, start, false); if (!nid) return ERR_PTR(-ENOENT); + f2fs_bug_on(sbi, check_nid_range(sbi, nid)); repeat: page = grab_cache_page(NODE_MAPPING(sbi), nid); if (!page) @@ -1127,9 +1132,9 @@ repeat: end = start + MAX_RA_NODE; end = min(end, NIDS_PER_BLOCK); for (i = start + 1; i < end; i++) { - nid_t tnid = get_nid(parent, i, false); - if (!tnid) - continue; + nid_t tnid; + + tnid = get_nid(parent, i, false); ra_node_page(sbi, tnid); } -- 2.6.3