Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp687890pxv; Thu, 22 Jul 2021 09:45:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxekCkKIaxBFXW8tEWbuZxYDLrX2F5yATDIF7fxV8hDuvcoF7bPM85/2sc6s8Xlsfx/TNGP X-Received: by 2002:a92:7312:: with SMTP id o18mr453236ilc.289.1626972303333; Thu, 22 Jul 2021 09:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972303; cv=none; d=google.com; s=arc-20160816; b=ph7CFmxpQtbke5SVzuv+yMl9ofD0rplxJyfqb6Z+MIX3m3gV7MCTBuO9yT3MXqzly6 qwNvhdqOjo6yhmkC+En0kDi9opbHd6pJfjMX4Z/nqWsrl+skZVsCnZkO+TaoPxyEwFrq ULYI5c7D//tqquCyEK01lsojGSRYXxAER3pBL/t3acBnI+4FufDESpzFpPYtLpa1SRBX L0mY65OXQldQPdnIaMrLTN3YrNEoDVC4Scss8JvsCdL1kcAsMvj0fRUJLkUAy6Y9oyEM gStTCjEPC3M/9oMtbP851g5GI4WLGRznI+egIU7xoPxmCAVVuwcfq0ifYzIDDPPB03N7 FnVQ== 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=kCsyFUT2AWo8OyJtT7f9BVdZjjyJo14+hLzD2aY24nY=; b=qOCZK/qF5cgAvKSxWiitirNXz6kUdeccWxJuE0yvrgk+n8uGzhwHyGixK3VRZIrIAe vzH3z/+1O9I96ky1q5NyrISz75m1nj1QxnmrVk4oKihyBIIaYlCuQkQONz+enRr6Qv2Q tV7FZKuhRb4A2B1aF/Ttqs6O5WRvDrRg85f5JxJyAuqsENZOp96x49LVrI46dT6V9JsU 0hn704Z+pBJPyqDYsGkEMqfxxmMQ4XMAve9fRv7sPlY1f3nOutjKxFY1yUf0kr9xgsU6 GBAvrkPgGhveYYoo35UOSJEXMzIs96dvkJgQMfQmPGqPDGvEqphDKF3dwOt8JnMMlgTj NfmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iPPEymlA; 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 v15si33775730jas.5.2021.07.22.09.44.52; Thu, 22 Jul 2021 09:45:03 -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=iPPEymlA; 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 S233276AbhGVQB4 (ORCPT + 99 others); Thu, 22 Jul 2021 12:01:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:37278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232927AbhGVP7x (ORCPT ); Thu, 22 Jul 2021 11:59:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C5188610F7; Thu, 22 Jul 2021 16:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972027; bh=MpoZvcM/5BK8c+vc/7urRevLkFZIw8q0tlEIgfHqjC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iPPEymlAwXkC0XQoRm9onMkZOmsyW6pN/BFY5RZVR3cBRjecNeOxqgJ+NdV2+4y/+ rWP4zuCAkCXR2tiQk/L4Ln+KaHKhECkMf3lOTxVCQ78uyWyPmCSib78rkSYXnglV1o DdrwdiqkI9RTAgLOrrr4F7RoSjT1FZX0QFzWsmes= 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.10 084/125] f2fs: Show casefolding support only when supported Date: Thu, 22 Jul 2021 18:31:15 +0200 Message-Id: <20210722155627.482328533@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@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 @@ -612,7 +612,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); #endif @@ -700,7 +702,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