From: Daniel Rosenberg drosen@google.com
commit 39307f8ee3539478c28e71b4909b5b028cce14b1 upstream. [Please apply to 5.10-stable, 5.12-stable, and 5.13-stable.]
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 drosen@google.com Reviewed-by: Eric Biggers ebiggers@google.com Reviewed-by: Chao Yu yuchao0@huawei.com Signed-off-by: Jaegeuk Kim jaegeuk@kernel.org Signed-off-by: Eric Biggers ebiggers@google.com --- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index ec77ccfea923..b8850c81068a 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -612,7 +612,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND); 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
On Tue, Jul 20, 2021 at 09:16:29AM -0700, Eric Biggers wrote:
From: Daniel Rosenberg drosen@google.com
commit 39307f8ee3539478c28e71b4909b5b028cce14b1 upstream. [Please apply to 5.10-stable, 5.12-stable, and 5.13-stable.]
Now queued up to 5.13 and 5.10 stable, thanks.
greg k-h
linux-stable-mirror@lists.linaro.org