Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3259433rwb; Mon, 15 Aug 2022 22:33:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR54F26NwI/1+SCM/U+O2z0U/I577PbrkuY3jIjipKzdUKPxcU+bJ6j+hIEF3vGSZhkGD3i+ X-Received: by 2002:a17:907:3ea8:b0:730:9756:7c81 with SMTP id hs40-20020a1709073ea800b0073097567c81mr12638937ejc.726.1660627993581; Mon, 15 Aug 2022 22:33:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660627993; cv=none; d=google.com; s=arc-20160816; b=iDPAaCRHnpvwWGRyhX2Py0wggAx8lwVzYYKEqpG+kV1Kvpoj5tOzvBEOETkoyZXleZ 3ed9tAjB3PBadLz0hs2H1V+7fXjLaWZOycRZpyBTGkbjk25TgGg6I+Vwa8Sb91S6KYJC /X7iiFgWN3FFD8hnrLyLkXYi0PGhJ/bLp3imQjvIcDXrdzd7YoEIK5XizRMaHJhOEd1Y hfHiAFeiYt6kpvAJ2HHShjvruj+snqbK3napgSUWYW0Eqko8F+iCxYvt/DvkOwkJKDqf A64Gaq3dGcrnvmjRCKu/nEwEXf4y3Y+UAnem0xHSasuxnJAiTV2+OtcNkXjafixY6+5u EwvQ== 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=0eiGMbc7odPZHRHX+CrLg+/pYs4d/Tjj8H/utQ6H4wo=; b=xlBnc7tMZyW6KkmjtDKqNEOnm93Qc8I94olUeew64u0NEUODTs1zA59tc0VFTSF05Y 3iIzaiEb0bNN43VvOatabj3i6tDs13yx54BCEXyxjFxH5MfoKKuxIRjNdgUPtt7VBoKi nBfaFgwCOMY2qpMdO04meYNP9+sLGyh3/SgQiusfLSrSKVehOkrCjGt/qLpNeBdM+y3J ZZzwuWx48wLTuvtuoFT5tCYh9gE25cOyuty3UnYn+tNy4KMQkP/mxwaiSLIgl6no2hol SS+o+KwqSpO0gkYVEcQUKLsFvdpmTbdtH2R1iEkmOZGlcYMRAeX0Z7RMgvGsIN6b7pL8 2fag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v+SqqGCq; 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 oz11-20020a1709077d8b00b007308ab90efbsi9575623ejc.776.2022.08.15.22.32.48; Mon, 15 Aug 2022 22:33:13 -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=v+SqqGCq; 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 S232804AbiHPEtf (ORCPT + 99 others); Tue, 16 Aug 2022 00:49:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232918AbiHPEqM (ORCPT ); Tue, 16 Aug 2022 00:46:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90D2A177616; Mon, 15 Aug 2022 13:43:57 -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 77C4C61234; Mon, 15 Aug 2022 20:43:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B493C433D6; Mon, 15 Aug 2022 20:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596236; bh=3cfjUBEI47FCH8s8YM21aQm7CshxOzd1w+K3D7ClE/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v+SqqGCqgVJvKpWxXk60QusM1mitPXSzavB+mk+1s60FpKUh1cZU+QAYSc4aK+xyg J6ItElHAZkwpKTewiTOi33W1QOGcsVHQrHy5olrWv1a1ujEzOHWE3OBfT1Wer7lefU +0o/SOx4/FAy2ocIo/N+syOlowM9W08E2XoKWOFs= 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.19 1008/1157] f2fs: fix to remove F2FS_COMPR_FL and tag F2FS_NOCOMP_FL at the same time Date: Mon, 15 Aug 2022 20:06:04 +0200 Message-Id: <20220815180520.153837637@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@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 bd14cef1b08f..110c459c78b6 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1873,10 +1873,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) @@ -1885,10 +1882,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