lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 078/700] f2fs: Advertise encrypted casefolding in sysfs
    Date
    From: Daniel Rosenberg <drosen@google.com>

    commit 4c039d5452691fe80260e4c3dd7b629a095bd0a7 upstream.

    Older kernels don't support encryption with casefolding. This adds
    the sysfs entry encrypted_casefold to show support for those combined
    features. Support for this feature was originally added by
    commit 7ad08a58bf67 ("f2fs: Handle casefolding with Encryption")

    Fixes: 7ad08a58bf67 ("f2fs: Handle casefolding with Encryption")
    Cc: stable@vger.kernel.org # v5.11+
    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/f2fs/sysfs.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/fs/f2fs/sysfs.c
    +++ b/fs/f2fs/sysfs.c
    @@ -525,6 +525,7 @@ enum feat_id {
    FEAT_CASEFOLD,
    FEAT_COMPRESSION,
    FEAT_TEST_DUMMY_ENCRYPTION_V2,
    + FEAT_ENCRYPTED_CASEFOLD,
    };

    static ssize_t f2fs_feature_show(struct f2fs_attr *a,
    @@ -546,6 +547,7 @@ static ssize_t f2fs_feature_show(struct
    case FEAT_CASEFOLD:
    case FEAT_COMPRESSION:
    case FEAT_TEST_DUMMY_ENCRYPTION_V2:
    + case FEAT_ENCRYPTED_CASEFOLD:
    return sprintf(buf, "supported\n");
    }
    return 0;
    @@ -649,7 +651,10 @@ F2FS_GENERAL_RO_ATTR(avg_vblocks);
    #ifdef CONFIG_FS_ENCRYPTION
    F2FS_FEATURE_RO_ATTR(encryption, FEAT_CRYPTO);
    F2FS_FEATURE_RO_ATTR(test_dummy_encryption_v2, FEAT_TEST_DUMMY_ENCRYPTION_V2);
    +#ifdef CONFIG_UNICODE
    +F2FS_FEATURE_RO_ATTR(encrypted_casefold, FEAT_ENCRYPTED_CASEFOLD);
    #endif
    +#endif /* CONFIG_FS_ENCRYPTION */
    #ifdef CONFIG_BLK_DEV_ZONED
    F2FS_FEATURE_RO_ATTR(block_zoned, FEAT_BLKZONED);
    #endif
    @@ -739,7 +744,10 @@ static struct attribute *f2fs_feat_attrs
    #ifdef CONFIG_FS_ENCRYPTION
    ATTR_LIST(encryption),
    ATTR_LIST(test_dummy_encryption_v2),
    +#ifdef CONFIG_UNICODE
    + ATTR_LIST(encrypted_casefold),
    #endif
    +#endif /* CONFIG_FS_ENCRYPTION */
    #ifdef CONFIG_BLK_DEV_ZONED
    ATTR_LIST(block_zoned),
    #endif

    \
     
     \ /
      Last update: 2021-07-12 09:24    [W:4.058 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site