From patchwork Tue Jul 11 20:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 119256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1244555vqm; Wed, 12 Jul 2023 08:52:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlE187Hqs28T9+xcQgiJp8I8WtXJt/prAVkxOAMxXJZ/GzIcBsslyVnqokCsJ5FYUOYBLd+0 X-Received: by 2002:a17:90a:ce06:b0:253:340d:77d8 with SMTP id f6-20020a17090ace0600b00253340d77d8mr19266302pju.33.1689177166179; Wed, 12 Jul 2023 08:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689177166; cv=none; d=google.com; s=arc-20160816; b=lMgtSRe670z9hp1DKithYFzhUM++PMqsfqa1uRVMG4x8y3yRgKLGtytvZMPVl3rv6y eVDQyuT4lXgnfgTBzvYdEdCy59z0zdecTlwh6IY1UYqZkeHxTStWkiTkM+esz6QYBzAh pzyeknPfgk/qpE/DAgXclgf1EuIU/kOFKOQ53w8STqKp1/hUgCA0NPICLAyZhWijuh9C VTETgJNPSQ+1PD4QGPsnQ/HuH83b4je+ANT4cOPGmlfGod91NcJcHQIrLZU+8lBUR73R JzU3904Cz16bXWY5gYdVC1psc0lBFyVkd51aT+YTSfwGricxmZEEkEfb+v9YwdEAk6TG Ibug== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=38qP+1kODye9qfaroRwtN/krv5NvSfk1Hm/pVS8TmHE=; fh=5/tJX5opFV5w1frY3pTlI79vDLVOntPbYwD9w+dLvhs=; b=rKfDs2t4v4TRJ4txaFqNTv9fcug8OEmzx9CePGeALxd3K34co9aAg7eWZadk/6qdv/ yOfI+ObsDVfWL/NS4JzEDNWUr2Kn7DvWndyRMOyZ7xOYYc1+eLMGpwJiwHx7x65jpvKw 0Xr5DtyWT/WVGBPpHqf6yR86pKUag+a2lpFhyAfsXMn04xpTsExn8vQwVN+5G9NkPUM5 ss8m0HsTRSQa59/7JNNQBlkycMpSnw5sQbybne9a8X2zNvj9R3dL7SdqFwHSto7Gy/X+ 3nujRp4DJwxJJZ0xmcT4mVK2AA5aPziVVydu/zOCqYNe9xg2sn90nPssSGgoQtSKD174 oOhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mMb3cYSH; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s9-20020a17090a440900b00262e49c31c2si3536576pjg.28.2023.07.12.08.52.32; Wed, 12 Jul 2023 08:52:46 -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=@kernel.org header.s=k20201202 header.b=mMb3cYSH; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233606AbjGLPhL (ORCPT + 99 others); Wed, 12 Jul 2023 11:37:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233363AbjGLPhI (ORCPT ); Wed, 12 Jul 2023 11:37:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A4611BB for ; Wed, 12 Jul 2023 08:37:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B4C2E61870 for ; Wed, 12 Jul 2023 15:37:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D66CC433CB; Wed, 12 Jul 2023 15:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689176227; bh=jc2J4H1tl9tgCU64obhJD7vtLmPv1NxjiyiMrRi0nP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mMb3cYSHrRSH4npwBLyUFpiFCf1EvxpvrdF7v1oe5x+SeBU19wQisO1/uhLglhibD jX59ayIP7pKY5uwJ/JsHXg+/2frEze6FSnRNNXSTbP0pbB/Kkfer2aqk7cCU/o+gTW B5kkNtiiiEhHOHR0cKJLWGlQ8mSkrm68D9AzpeWq+43n8WAghRchJ9gTEj8UFpCB16 ptIvBWqs22lSQEQ1fi8w4DZDiwrqrIed8Tj8I0eeuiouS+9Bu4F8KKHVyLSti4BT4c OHoYfi8SRmAIMvVrqO1wvTPzqelcuTO04eVtr68Ng2GVkmlJj260fid/JEsUazfDkq QUfE3Hpy7bTkg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 2/2] f2fs: compress: don't {,de}compress non-full cluster Date: Wed, 12 Jul 2023 04:08:06 +0800 Message-Id: <20230711200806.4884-2-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230711200806.4884-1-chao@kernel.org> References: <20230711200806.4884-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DATE_IN_PAST_12_24, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771230636155546094 X-GMAIL-MSGID: 1771230636155546094 f2fs won't compress non-full cluster in tail of file, let's skip dirtying and rewrite such cluster during f2fs_ioc_{,de}compress_file. Signed-off-by: Chao Yu --- fs/f2fs/file.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 79cb6a41f128..74f79e7c8c02 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4092,10 +4092,8 @@ static int f2fs_ioc_decompress_file(struct file *filp) last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); count = last_idx - page_idx; - while (count) { - int len = min(cluster_size, count); - - ret = redirty_blocks(inode, page_idx, len); + while (count && count >= cluster_size) { + ret = redirty_blocks(inode, page_idx, cluster_size); if (ret < 0) break; @@ -4105,8 +4103,8 @@ static int f2fs_ioc_decompress_file(struct file *filp) break; } - count -= len; - page_idx += len; + count -= cluster_size; + page_idx += cluster_size; cond_resched(); if (fatal_signal_pending(current)) { @@ -4172,10 +4170,8 @@ static int f2fs_ioc_compress_file(struct file *filp) last_idx = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); count = last_idx - page_idx; - while (count) { - int len = min(cluster_size, count); - - ret = redirty_blocks(inode, page_idx, len); + while (count && count >= cluster_size) { + ret = redirty_blocks(inode, page_idx, cluster_size); if (ret < 0) break; @@ -4185,8 +4181,8 @@ static int f2fs_ioc_compress_file(struct file *filp) break; } - count -= len; - page_idx += len; + count -= cluster_size; + page_idx += cluster_size; cond_resched(); if (fatal_signal_pending(current)) {