From patchwork Wed Feb 28 13:46:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 129991 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp1548808edc; Wed, 28 Feb 2018 05:46:51 -0800 (PST) X-Google-Smtp-Source: AH8x227ivTKGNuQb/uFFlH2xfjsItI/nZ6241ZkvafSYeeWSUKnXuj6J+pDNBi/Ya5VPhuay6sMC X-Received: by 10.98.234.22 with SMTP id t22mr17797125pfh.56.1519825611037; Wed, 28 Feb 2018 05:46:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519825611; cv=none; d=google.com; s=arc-20160816; b=Z7Z58Em0HDjDy5Sob44Wj00ABTEtFPKZ1QhJiCXbDf7McLfDiWUmvIJZWPcHqfCDht hrHeqwOxKzrfcENRSExzV35e/u03Ms3yMCCQ2Kasa9AnYsOy3fmv8HHOMRAvHZnJqCBe fxc/QKwgeh0C68Dxa0xYeIrQg88wND4yv+D+ePP/GAYkqQv6bI8nG+5oeL83VXHctmtU HuoWrwQCuc7lT9Je6ygBqOqKtJgCgYPH7AxOSLrGVK3f7fim/MnP6IrUNxc1Nw+2lDFx s6Wo7OKFfJr8ELE8N1oQmEvVZ72Jza2QJ+X8XFovg8peiB3DfKEX4739+RspO2P1y+3q vOFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=XivQzTzvJTGKNWL9u2ZphE/e4zpxkRgT6DQz68uvqpI=; b=htYdfkP7OZs5ynZGUzvnEg4iXsRktSCfSJDLfath5i8jEo6J8zRQEsGt/GhGIWL0l5 UqyTU1Tn1mhzycsl/NLss/7GYoupQaYdNJ7xK6DdRISunXOpNcShKsQWA8/oMyehRtUZ S9PBEAht/dHjl998QJEKK66DzAI+7SRcyBrk+kcufZ7LjjzvQhBPI2Kvk5VjFhFy8aqg eXsRnwAOedF0ZbQAreeiVMBseq5VHgM4RjciBjFzMcY4Hkmta2FhZqwyTRkUp++OLH3X uy00r8/VJnXoJY9VTrBPJJ3ITyeGWxZelm1x0R0m8uSWckuDnjwSTWRukKnYib++rU0U a9tQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1-v6si1289553plb.777.2018.02.28.05.46.50; Wed, 28 Feb 2018 05:46:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752469AbeB1Nqu (ORCPT + 10 others); Wed, 28 Feb 2018 08:46:50 -0500 Received: from mx2.suse.de ([195.135.220.15]:40848 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752206AbeB1Nqt (ORCPT ); Wed, 28 Feb 2018 08:46:49 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1EF46AD28; Wed, 28 Feb 2018 13:46:48 +0000 (UTC) From: Nikolay Borisov To: greg@kroah.com Cc: stable@vger.kernel.org, jaegeuk@kernel.org, heyunlei@huawei.com, Nikolay Borisov Subject: [PATCH 4.9.y] f2fs: fix a bug caused by NULL extent tree Date: Wed, 28 Feb 2018 15:46:41 +0200 Message-Id: <1519825601-13329-1-git-send-email-nborisov@suse.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20180228122833.GB28076@kroah.com> References: <20180228122833.GB28076@kroah.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yunlei He Thread A: Thread B: -f2fs_remount -sbi->mount_opt.opt = 0; <--- -f2fs_iget -do_read_inode -f2fs_init_extent_tree -F2FS_I(inode)->extent_tree is NULL -default_options && parse_options -remount return <--- -f2fs_map_blocks -f2fs_lookup_extent_tree -f2fs_bug_on(sbi, !et); The same problem with f2fs_new_inode. Signed-off-by: Yunlei He Signed-off-by: Jaegeuk Kim Signed-off-by: Nikolay Borisov --- Hi, Here is the 4.9.y backport fs/f2fs/extent_cache.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 7b32ce979fe1..63e519658d73 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -177,7 +177,7 @@ static void __drop_largest_extent(struct inode *inode, } /* return true, if inode page is changed */ -bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) +static bool __f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct extent_tree *et; @@ -215,6 +215,16 @@ bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) return false; } +bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) +{ + bool ret = __f2fs_init_extent_tree(inode, i_ext); + + if (!F2FS_I(inode)->extent_tree) + set_inode_flag(inode, FI_NO_EXTENT); + + return ret; +} + static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, struct extent_info *ei) {