Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2885213rwb; Mon, 15 Aug 2022 13:17:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR4ExtYB9xwh/JxrZJHP33dShqPqtNXQJWqUr9PoS9UiGOLTkOVmPnSTquN79gNHSNwPxd/i X-Received: by 2002:a17:907:20d1:b0:731:5169:106b with SMTP id qq17-20020a17090720d100b007315169106bmr11558724ejb.667.1660594669497; Mon, 15 Aug 2022 13:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660594669; cv=none; d=google.com; s=arc-20160816; b=reB4iPwh++UXpO2jtuq2Z8BVZRRcSAObxqmojLh1ZzC2DWTBkEfN6BvmXoMX5Vdgrd bqX1ZeMLd1DIwPr+3xwk4/Ww4f3jHVWrfDN3Uw5GtTZwd1xADKHQ44dw7VaqXumlYswQ Ig3sgH4z1aaLy5/w8gS0ozK47Sb1pUtsKsBmO3TZs0rtRNxM6K6o1Otd3Xzd77T5SEgo iAoaxo0dva1xv57NBIRbZPXljwev4Xczoa14xJctkViXxx4ZyVx3+B5xBLNVUMgf8Ssr WR6QlF15ojWk7wAXLSO4vwzgZMB5BzRxLTOu3/BoGSayhu2B5W/MlI1+kcyccMfgkwMm v/4g== 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=6ZgI/cQnxkh95wIyHSGTZ1hVD62QZSksGQwlhAxa09M=; b=XEfI62PCwHX+rfioxvrLFygwYj/mhih99Koq9LltXNc5ZpEuysJAwLBO42Z6Zm5NS4 0O7jpqAORk520O+HeZd2rFH2GT/MHW7mO/3PqgpFyov0qQ/S9FYgkl8ZZziEfE4bSM7L nSBUdy26QoZz05LrtKjDa4PfJGCxhCs+/KLZxJB4fScViwaoxnPE/+pYHc8F4Q17t0Zc tBJr9pN7xMeiBCErFIQ+59iQ2KsxukoviYrDRsOAD0e38Bksqpkw9hQLK37+KsSYmFSy S0VWJTlZwrHyDxotZz2pBwOWLOyvyhd/YTibweDU6ZNvvWzcoJ9aLdqQSNGFqJVEu8kf vyFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uy1xStPz; 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 b5-20020a056402084500b0044301c7cd06si9695627edz.91.2022.08.15.13.17.22; Mon, 15 Aug 2022 13:17:49 -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=uy1xStPz; 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 S1344435AbiHOTnK (ORCPT + 99 others); Mon, 15 Aug 2022 15:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344193AbiHOTip (ORCPT ); Mon, 15 Aug 2022 15:38:45 -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 741F43FA30; Mon, 15 Aug 2022 11:46:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 116D161029; Mon, 15 Aug 2022 18:46:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C10F3C433C1; Mon, 15 Aug 2022 18:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660589202; bh=miZTVE+YOz/R7w6hCTacYkqD1Esp9ssmE5hadX5Egfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uy1xStPzbGNsCSCUpmSwggnWAaL7KpOwS43+xk6ZmWisZ/TGwoaJkhYOXn+jTRdpr 36db4YxrxU+PDDKloFpc5WGZPAHv4kcEFHWYn/ufwiQ8MGZTz0hgRFE0oUjodQVS53 X34E8RoVQd7msnJiZcPfxLzpRaIDjZL6dORVNgUE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Chao Liu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.15 645/779] f2fs: fix to remove F2FS_COMPR_FL and tag F2FS_NOCOMP_FL at the same time Date: Mon, 15 Aug 2022 20:04:49 +0200 Message-Id: <20220815180404.932766673@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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: Chao Liu [ Upstream commit 8ee236dcaa690d09ca612622e8bc8d09c302021d ] If the inode has the compress flag, it will fail to use 'chattr -c +m' to remove its compress flag and tag no compress flag. However, the same command will be successful when executed again, as shown below: $ touch foo.txt $ chattr +c foo.txt $ chattr -c +m foo.txt chattr: Invalid argument while setting flags on foo.txt $ chattr -c +m foo.txt $ f2fs_io getflags foo.txt get a flag on foo.txt ret=0, flags=nocompression,inline_data Fix this by removing some checks in f2fs_setflags_common() that do not affect the original logic. I go through all the possible scenarios, and the results are as follows. Bold is the only thing that has changed. +---------------+-----------+-----------+----------+ | | file flags | + command +-----------+-----------+----------+ | | no flag | compr | nocompr | +---------------+-----------+-----------+----------+ | chattr +c | compr | compr | -EINVAL | | chattr -c | no flag | no flag | nocompr | | chattr +m | nocompr | -EINVAL | nocompr | | chattr -m | no flag | compr | no flag | | chattr +c +m | -EINVAL | -EINVAL | -EINVAL | | chattr +c -m | compr | compr | compr | | chattr -c +m | nocompr | *nocompr* | nocompr | | chattr -c -m | no flag | no flag | no flag | +---------------+-----------+-----------+----------+ Link: https://lore.kernel.org/linux-f2fs-devel/20220621064833.1079383-1-chaoliu719@gmail.com/ Fixes: 4c8ff7095bef ("f2fs: support data compression") Reviewed-by: Chao Yu Signed-off-by: Chao Liu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/file.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index bfcafc20eada..eacc80ac160f 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1869,10 +1869,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) if (masked_flags & F2FS_COMPR_FL) { if (!f2fs_disable_compressed_file(inode)) return -EINVAL; - } - if (iflags & F2FS_NOCOMP_FL) - return -EINVAL; - if (iflags & F2FS_COMPR_FL) { + } else { if (!f2fs_may_compress(inode)) return -EINVAL; if (S_ISREG(inode->i_mode) && inode->i_size) @@ -1881,10 +1878,6 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) set_compress_context(inode); } } - if ((iflags ^ masked_flags) & F2FS_NOCOMP_FL) { - if (masked_flags & F2FS_COMPR_FL) - return -EINVAL; - } fi->i_flags = iflags | (fi->i_flags & ~mask); f2fs_bug_on(F2FS_I_SB(inode), (fi->i_flags & F2FS_COMPR_FL) && -- 2.35.1