Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp694499pxv; Thu, 22 Jul 2021 09:53:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2mEb+2ZCYgc1C1lS5HWDcPPrNCukGSfX0psde0OPk5Q+mBnooPrn0miLj4849gYNK3dTL X-Received: by 2002:a17:906:d20a:: with SMTP id w10mr831557ejz.426.1626972805014; Thu, 22 Jul 2021 09:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972805; cv=none; d=google.com; s=arc-20160816; b=B+ex1NaNciBUMKxGt2psDfb5peU/yuGwai+4dX7v3jacEZb7CJGD1LzNy+hPiGOyFQ QsCOlIwbfPLnIK83txnE173D/YCiCOEIs771zwr/C+wmkj34wrZbPri/bOwD7WtWU1n7 4gLywR6DYDxv1lgIURHj2Afhbuw/ZCGp4fgPaY+6s+i6qirqvrV46skiGkzsFBwZ0qBb OqPROfz2vJM+lakEvzMEwnF2sYgHPJZqQ4GLYigqZJAYlXn8XwAO+GdTiG+CXhfL64vO FQEwgDbjahH3clLOaDYov3qCGdbPHrlw4AHZ8Q9TIIpv6+R6My3raHUlylRR1vv3ZZUg v6Ig== 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=KiElDabw1BYAJ2aDdqE0hiLAWXKwXWMbp8IHnqC6KgE=; b=jP8NxvGQuWuYfLvHhynPHX5zFcVxNLfOWfh4ASoziw/RANR0V6MWRB7VJiHrLnlKT/ zC8OKSFZM8RH0PqHlDdn3Zn4ljv5hY9Fuw9Gl18fa6OgTCRJTIxAxQfDJRdQxSBL+iwo EM0Bn0xLw0CJrVtPF7JqoSf6XGtn7jWroZnwOyGFA6z3yLFPDqg998hLt1kdxtvDEfnj V+HwtqN307YbhAGnBPEURaFtLCz2Ph3gp198nxY4ZZ0TO1CbEKBh3Y+bdQhvA1TIW2Aa vjHjSVFvWeKYYDAOalmeMK4a65yPrEKTTrhS8eDu+tuLV+6PukqfTMdUZvF4fAoMS1eA Pi9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WIYnTNFj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lf5si30430906ejc.236.2021.07.22.09.53.01; Thu, 22 Jul 2021 09:53:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WIYnTNFj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S234922AbhGVQLA (ORCPT + 99 others); Thu, 22 Jul 2021 12:11:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:47280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234671AbhGVQG3 (ORCPT ); Thu, 22 Jul 2021 12:06:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AE4C361D10; Thu, 22 Jul 2021 16:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972423; bh=HiLa/+eltHkBEwR7KeEGN4binOH28d/xixyrZnaDKyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WIYnTNFjvf6EuY/lgQ9yILQO/mR7hTZgP0VyXupHzWauqTfBKVnrLAXBzO22xvXJr DlmfppaWgLIqrQl9kGK/+9wVemv+bHtHBH268gZ7L+OMl33X7EflrYgUSt2meNGXcQ FFVfSfoWj/4ZkaEjHLwFIzJd2UejeO5B4cU+7vKs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Rosenberg , Eric Biggers , Chao Yu , Jaegeuk Kim Subject: [PATCH 5.13 107/156] f2fs: Show casefolding support only when supported Date: Thu, 22 Jul 2021 18:31:22 +0200 Message-Id: <20210722155631.829413948@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Rosenberg commit 39307f8ee3539478c28e71b4909b5b028cce14b1 upstream. The casefolding feature is only supported when CONFIG_UNICODE is set. This modifies the feature list f2fs presents under sysfs accordingly. Fixes: 5aba54302a46 ("f2fs: include charset encoding information in the superblock") Cc: stable@vger.kernel.org # v5.4+ Signed-off-by: Daniel Rosenberg Reviewed-by: Eric Biggers Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -708,7 +708,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LO F2FS_FEATURE_RO_ATTR(verity, FEAT_VERITY); #endif F2FS_FEATURE_RO_ATTR(sb_checksum, FEAT_SB_CHECKSUM); +#ifdef CONFIG_UNICODE F2FS_FEATURE_RO_ATTR(casefold, FEAT_CASEFOLD); +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION F2FS_FEATURE_RO_ATTR(compression, FEAT_COMPRESSION); F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, compr_written_block, compr_written_block); @@ -810,7 +812,9 @@ static struct attribute *f2fs_feat_attrs ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION ATTR_LIST(compression), #endif