Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp681044pxv; Thu, 22 Jul 2021 09:37:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYl33ZYX2UclM8nnJjZw6CBa1G3opvJZcOtZIC3EA2JGhWPcPpwBpXVSILKqv/a4iD2SK0 X-Received: by 2002:a02:c496:: with SMTP id t22mr389747jam.80.1626971828961; Thu, 22 Jul 2021 09:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626971828; cv=none; d=google.com; s=arc-20160816; b=ZBaHKMI8QwndN+iVhNmqmh7yyS0wJiLQqKctMrplhtg8UnWP8aeOD1FJxS6DeEsrxg UhYvK5peAUssrRl35pzZSRnND0Kl8v3OsAH7xeF9fKiVxsoQJ9AOqtYe5kicfQf1q5+7 T+OqqW25vi5+kKrHU3jgY/+2C09cwjcAvC4ArXR6uDs4nsLzVr8vmdXD3oQDlkMz+YAB WtCeLcnhSTvbrazOIeFOIvUpOniF7BbunS9MxRajL2ZEh+VX7Nsir4uSHqaRsNnRN9zm +0QjOZRJ24SIBsEQ7g8faDmGjfz78EspmqCd7Zbfbrx9mduNylk/kIZ8d6cuxpVZF74E 6/Vg== 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=BNoaic2MGOB3CEueISExtfOt9JV8rMrljs0dUNPLDWQ=; b=pBSs/9c/2Ln306YlmRexL0KXY0elWGUqyM1DNpG9n8LG9aNKOzsEJpr4xadFi9ZtIX OTwHay1kv58b4yt0/h3Sp0QtDeztajb4XAuFNE6dFvHJ1we/f2SRA0RvGqFE84JPfOtJ rTrbyPe0BfEUdXWH+DGDLR5e9gI4w8vqzF9kw9KMhJyd4XoT9kP7lCDWRxwFM5vPRg0S aK8Ikxu3qKOTGe7tO9WOMvQEdMJ08ynYFzMKzh8hUApTX3qhAAIypnDLw6vZ0K/1+kei E8rHUYl5gmlErVAYen0blag6nqiLqdfxvzhV3BTeX71hoMrsobba7pnbAaJADIQi/LwS ggQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="J/kzXYhb"; 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 w3si23210686iol.91.2021.07.22.09.36.57; Thu, 22 Jul 2021 09:37:08 -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="J/kzXYhb"; 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 S230294AbhGVPx7 (ORCPT + 99 others); Thu, 22 Jul 2021 11:53:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:57328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230310AbhGVPxj (ORCPT ); Thu, 22 Jul 2021 11:53:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C960361363; Thu, 22 Jul 2021 16:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971654; bh=3FYz4SJJq6mYJ/XSExS4oyCjehrzy/jBEMzzP47kME4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J/kzXYhbO9hQh+Xj0C4w/k6vZltdNGXO3K3dsnP790oLgaPsoAY/fFQM4UlFVwOCI 6cVJiG2INu773HU070fHGuJcS+fHzl/F8gjylkG+N4sd58lQptb566txLzudXdO5S4 B0kLKVnrs4qCkKHMng6MP+8T1EjYjOMEydE0QfDQ= 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.4 48/71] f2fs: Show casefolding support only when supported Date: Thu, 22 Jul 2021 18:31:23 +0200 Message-Id: <20210722155619.471159512@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155617.865866034@linuxfoundation.org> References: <20210722155617.865866034@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: Greg Kroah-Hartman --- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -499,7 +499,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 #define ATTR_LIST(name) (&f2fs_attr_##name.attr) static struct attribute *f2fs_attrs[] = { @@ -568,7 +570,9 @@ static struct attribute *f2fs_feat_attrs ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif NULL, }; ATTRIBUTE_GROUPS(f2fs_feat);