Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2428562iob; Fri, 6 May 2022 02:39:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZvrJwfg2KQ3gE5V2Z5sAkbpgdxgrfavsgKBa16rL/dU8XDW9v3YVNQ1jPgR5Ze4wsDT9F X-Received: by 2002:a17:906:4f0f:b0:6f4:667c:ff9d with SMTP id t15-20020a1709064f0f00b006f4667cff9dmr2195647eju.519.1651829961951; Fri, 06 May 2022 02:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651829961; cv=none; d=google.com; s=arc-20160816; b=qTyIth6fbPQ9hNQlToZ7yXcvFeIBwhT+FVqu4uktg8mMxZu3ZAC3cUJqMw+vJmp4sl 5QbYciAvP04ATZ7qkb7eOpKMSgx4R/K6x305kPKtxjIF12Lp8Tr7uUNKcVMt9ESU6/Xu Wik7mSrMnBViVQ44vLm+WedftckGJrX72yOkJsBCjdf+Bcf86v08hOG1XDaWIek/x5ea U67qr0BL9htwkaRufHxFIJkUiIXoNoSc72B7x+aHFjSW0ic8NBBRcyWLInCoA/CT9fY5 N5FEOrdM0cgm1TxMJZPrLfN9MDr7Txq1diMCvw8PCtjv63eBolOQKDkYvEOFhTHmT/oj yAXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BLni25JPuAyxQ3gI+hauSDhlJE5EsO7K+FUWvSODkz0=; b=z5FtOTtJP8OGtomVjAzNU3BPXlKkhfmmwUO/E3uQC4IIPqRZnzbpt8HOc+het49zAQ 3Ii98F3bXpsVThuIF3Wuay0rK/CRHuizdWfZGbiBGFW0I1ftgNYoOk1vN5dSdTlwCmtg xs5Cip+YEI+v4iQij1L2GqV6IxuR84XPBGgll6kN1vHh3uzI9z9dEQvgDwqqR9UzkItt JGjtlM1ezK49DT5zolnods5PSqkY4XV0KZcjxV6L/6D6EDhPTbnIHyPNtn2zZJEEU4Od yIoODvxuav2hNf4sdGpWaJpH5ay+2falLjGqxEYm0EXs8Xfdks/9zDrRKn3cXdDhHKM+ MU2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YDEYkk3Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w23-20020a1709062f9700b006e897db2df4si4580102eji.155.2022.05.06.02.38.56; Fri, 06 May 2022 02:39:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YDEYkk3Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357154AbiEDRbc (ORCPT + 99 others); Wed, 4 May 2022 13:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356885AbiEDRJs (ORCPT ); Wed, 4 May 2022 13:09:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AB2E4553B; Wed, 4 May 2022 09:56:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CBE74B82795; Wed, 4 May 2022 16:56:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51567C385A5; Wed, 4 May 2022 16:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683375; bh=K32jkouY8bCApJeS1xG/u8VhN90LNIqFe6Zp9teHNIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YDEYkk3ZUbqcsm8BIrCFqA/a0mbuAUdxV1M4T5JHh+q+vB7bmsSrs6m4RC0o7HxPu d+zrr3vsPEEQsgQP/jjb4gv1fx6VU1sdM6NAGAQv6qm1HJSn0hwds2Lv8/wBq8nsgf qyK3+XWs7ON2Y+yygu74cdUJ9GqwWt3miUn8gDxY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaegeuk Kim Subject: [PATCH 5.17 046/225] f2fs: should not truncate blocks during roll-forward recovery Date: Wed, 4 May 2022 18:44:44 +0200 Message-Id: <20220504153114.207957787@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jaegeuk Kim commit 4d8ec91208196e0e19195f1e7d6be9de5873f242 upstream. If the file preallocated blocks and fsync'ed, we should not truncate them during roll-forward recovery which will recover i_size correctly back. Fixes: d4dd19ec1ea0 ("f2fs: do not expose unwritten blocks to user by DIO") Cc: # 5.17+ Signed-off-by: Jaegeuk Kim Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 71f232dcf3c2..83639238a1fe 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -550,7 +550,8 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) } f2fs_set_inode_flags(inode); - if (file_should_truncate(inode)) { + if (file_should_truncate(inode) && + !is_sbi_flag_set(sbi, SBI_POR_DOING)) { ret = f2fs_truncate(inode); if (ret) goto bad_inode; -- 2.36.0