From patchwork Tue Feb 27 11:23:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 129773 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1273738lja; Tue, 27 Feb 2018 03:23:12 -0800 (PST) X-Google-Smtp-Source: AH8x224DzmGUxj1yXfazed9DQeecbp9c2WNLmKhVocpMxOoh7lSpfRRzSICzY1FUvvKGVx23EACR X-Received: by 10.99.171.10 with SMTP id p10mr10948285pgf.176.1519730592395; Tue, 27 Feb 2018 03:23:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519730592; cv=none; d=google.com; s=arc-20160816; b=x1Lh2OeOo+Phn2XhD73mRZLs3t7zBXzhcyiA+5EN3ZPWDDb66JxzMvI2onglf2H7sb LNQoUryKxGNz5mcTbOkFJt5MTrtoHmPvnQ4JuDzTlcc9Ycr6MFmdXhRSbv+kknN0CS1T 02bH2DJ5PPHTKY+eBq/JHorutiVwad0RHyK3ZINdaj3Y8VOO5p09BdmhVxiMniut94NF GemKCu6NWYYipn/k2pLCFqckRnz4hMfCbgSMW2AuO8qTnKkE9w2u3zjMMrjHZTxYjazX aCC8ZfR6uqkDQZxMnQSzRDP4zPLUnZImyDVdeyiyrb0aRVG9KW0nikRJdnLex4Xj335L WgUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=66+2+tw8XCjmr1GfO7v7MuWYp3LPwYLMEq1pjXcIBoI=; b=L7z5n82YtIHCTQUvKw++XXXr0+oZ+kOAN0OdqkbuT2DnIId7qT9MaKMQ7oIRf21KMX HabiITBme5ndhaZKxmX/sC4dfMenkpQx2Icrzh1m7vYu8N/DIE4D9YdGnvHvJ5hra8+A S0q4sSpKgXLf3sjiOgZo9bRPKfWGQeaEsCrGfHZNH57iEM4A1QG1Pe5pzeldTSKGsvP3 qJlFODEBOsVSFvpcuFlcuPSDIIMzDUOf0moqX30fjvdZGlEz+t1NctDiDAas+76oOslc HpxdlnwL7r5lRkNrbpnoXb2z+lOgBvw8CkSNtfeG9g+4mYkYSxZY+SvbSNAgtBjItHWq KrUQ== 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 g63si8470791pfb.52.2018.02.27.03.23.12; Tue, 27 Feb 2018 03:23:12 -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 S1752844AbeB0LXL (ORCPT + 10 others); Tue, 27 Feb 2018 06:23:11 -0500 Received: from mx2.suse.de ([195.135.220.15]:44076 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752185AbeB0LXL (ORCPT ); Tue, 27 Feb 2018 06:23:11 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D7952AB37; Tue, 27 Feb 2018 11:23:09 +0000 (UTC) From: Nikolay Borisov To: stable@vger.kernel.org Cc: chao2.yu@samsung.com, jaegeuk@kernel.org, cm224.lee@samsung.com, Yunlei He , Nikolay Borisov Subject: [PATCH 4.4] f2fs: fix a bug caused by NULL extent tree Date: Tue, 27 Feb 2018 13:23:05 +0200 Message-Id: <1519730585-909-1-git-send-email-nborisov@suse.com> X-Mailer: git-send-email 2.7.4 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 --- Hello Greg, I would like to have upstream commit dad48e73127b ("f2fs: fix a bug caused by NULL extent tree") included in the 4.4 stable kernel. This is the backport of it. fs/f2fs/extent_cache.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 7ddba812e11b..6827b9c942dc 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -172,7 +172,7 @@ void f2fs_drop_largest_extent(struct inode *inode, pgoff_t fofs) __drop_largest_extent(inode, fofs, 1); } -void f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) +static void __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; @@ -204,6 +204,14 @@ void f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) write_unlock(&et->lock); } +void f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) +{ + __f2fs_init_extent_tree(inode, i_ext); + + if (!F2FS_I(inode)->extent_tree) + set_inode_flag(F2FS_I(inode), FI_NO_EXTENT); +} + static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, struct extent_info *ei) {