From: Eric Biggers <ebiggers@kernel.org>
To: Daniel Rosenberg <drosen@google.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org>,
linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Gabriel Krisman Bertazi <krisman@collabora.com>,
kernel-team@android.com, stable@vger.kernel.org
Subject: Re: [PATCH v2 2/2] f2fs: Advertise encrypted casefolding in sysfs
Date: Thu, 3 Jun 2021 11:26:22 -0700 [thread overview]
Message-ID: <YLkezhSmr+aC0v9p@sol.localdomain> (raw)
In-Reply-To: <20210603095038.314949-3-drosen@google.com>
On Thu, Jun 03, 2021 at 09:50:38AM +0000, Daniel Rosenberg wrote:
> 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>
> ---
> fs/f2fs/sysfs.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 09e3f258eb52..6604291a3cdf 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -161,6 +161,9 @@ static ssize_t features_show(struct f2fs_attr *a,
> if (f2fs_sb_has_compression(sbi))
> len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> len ? ", " : "", "compression");
> + if (f2fs_sb_has_casefold(sbi) && f2fs_sb_has_encrypt(sbi))
> + len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> + len ? ", " : "", "encrypted_casefold");
> len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> len ? ", " : "", "pin_file");
> len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> @@ -579,6 +582,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,
> @@ -600,6 +604,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,
> case FEAT_CASEFOLD:
> case FEAT_COMPRESSION:
> case FEAT_TEST_DUMMY_ENCRYPTION_V2:
> + case FEAT_ENCRYPTED_CASEFOLD:
> return sprintf(buf, "supported\n");
> }
> return 0;
> @@ -704,7 +709,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);
> -#endif
> +#ifdef CONFIG_UNICODE
> +F2FS_FEATURE_RO_ATTR(encrypted_casefold, FEAT_ENCRYPTED_CASEFOLD);
> +#endif /* CONFIG_UNICODE */
> +#endif /* CONFIG_FS_ENCRYPTION */
I had only asked for the #endif comment for CONFIG_FS_ENCRYPTION, since that is
a longer block. #endif comments aren't helpful for single-line blocks.
See Documentation/process/coding-style.rst:
At the end of any non-trivial #if or #ifdef block (more than a few lines),
place a comment after the #endif on the same line, noting the conditional
expression used.
Anyway, doesn't matter much...
Reviewed-by: Eric Biggers <ebiggers@google.com>
- Eric
WARNING: multiple messages have this Message-ID
From: Eric Biggers <ebiggers@kernel.org>
To: Daniel Rosenberg <drosen@google.com>
Cc: kernel-team@android.com, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
Gabriel Krisman Bertazi <krisman@collabora.com>
Subject: Re: [f2fs-dev] [PATCH v2 2/2] f2fs: Advertise encrypted casefolding in sysfs
Date: Thu, 3 Jun 2021 11:26:22 -0700 [thread overview]
Message-ID: <YLkezhSmr+aC0v9p@sol.localdomain> (raw)
In-Reply-To: <20210603095038.314949-3-drosen@google.com>
On Thu, Jun 03, 2021 at 09:50:38AM +0000, Daniel Rosenberg wrote:
> 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>
> ---
> fs/f2fs/sysfs.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index 09e3f258eb52..6604291a3cdf 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -161,6 +161,9 @@ static ssize_t features_show(struct f2fs_attr *a,
> if (f2fs_sb_has_compression(sbi))
> len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> len ? ", " : "", "compression");
> + if (f2fs_sb_has_casefold(sbi) && f2fs_sb_has_encrypt(sbi))
> + len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> + len ? ", " : "", "encrypted_casefold");
> len += scnprintf(buf + len, PAGE_SIZE - len, "%s%s",
> len ? ", " : "", "pin_file");
> len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> @@ -579,6 +582,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,
> @@ -600,6 +604,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,
> case FEAT_CASEFOLD:
> case FEAT_COMPRESSION:
> case FEAT_TEST_DUMMY_ENCRYPTION_V2:
> + case FEAT_ENCRYPTED_CASEFOLD:
> return sprintf(buf, "supported\n");
> }
> return 0;
> @@ -704,7 +709,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);
> -#endif
> +#ifdef CONFIG_UNICODE
> +F2FS_FEATURE_RO_ATTR(encrypted_casefold, FEAT_ENCRYPTED_CASEFOLD);
> +#endif /* CONFIG_UNICODE */
> +#endif /* CONFIG_FS_ENCRYPTION */
I had only asked for the #endif comment for CONFIG_FS_ENCRYPTION, since that is
a longer block. #endif comments aren't helpful for single-line blocks.
See Documentation/process/coding-style.rst:
At the end of any non-trivial #if or #ifdef block (more than a few lines),
place a comment after the #endif on the same line, noting the conditional
expression used.
Anyway, doesn't matter much...
Reviewed-by: Eric Biggers <ebiggers@google.com>
- Eric
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-06-03 18:26 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 9:50 [PATCH v2 0/2] Fix up casefolding sysfs entries for F2FS Daniel Rosenberg
2021-06-03 9:50 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel
2021-06-03 9:50 ` [PATCH v2 1/2] f2fs: Show casefolding support only when supported Daniel Rosenberg
2021-06-03 9:50 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel
2021-06-03 18:20 ` Eric Biggers
2021-06-03 18:20 ` [f2fs-dev] " Eric Biggers
2021-06-04 23:46 ` Chao Yu
2021-06-04 23:46 ` [f2fs-dev] " Chao Yu
2021-06-03 9:50 ` [PATCH v2 2/2] f2fs: Advertise encrypted casefolding in sysfs Daniel Rosenberg
2021-06-03 9:50 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel
2021-06-03 10:04 ` Greg KH
2021-06-03 10:04 ` [f2fs-dev] " Greg KH
2021-06-03 15:40 ` Jaegeuk Kim
2021-06-03 15:40 ` [f2fs-dev] " Jaegeuk Kim
2021-06-03 17:26 ` Greg KH
2021-06-03 17:26 ` [f2fs-dev] " Greg KH
2021-06-03 17:53 ` Jaegeuk Kim
2021-06-03 17:53 ` [f2fs-dev] " Jaegeuk Kim
2021-06-03 18:12 ` Greg KH
2021-06-03 18:12 ` [f2fs-dev] " Greg KH
2021-06-03 19:20 ` Jaegeuk Kim
2021-06-03 19:20 ` [f2fs-dev] " Jaegeuk Kim
2021-06-03 20:54 ` David Laight
2021-06-03 20:54 ` [f2fs-dev] " David Laight
2021-06-03 18:26 ` Eric Biggers [this message]
2021-06-03 18:26 ` Eric Biggers
2021-06-03 23:21 ` Eric Biggers
2021-06-03 23:21 ` [f2fs-dev] " Eric Biggers
2021-06-04 4:45 ` Jaegeuk Kim
2021-06-04 4:45 ` [f2fs-dev] " Jaegeuk Kim
2021-06-04 5:01 ` Eric Biggers
2021-06-04 5:01 ` [f2fs-dev] " Eric Biggers
2021-06-04 5:38 ` Jaegeuk Kim
2021-06-04 5:38 ` [f2fs-dev] " Jaegeuk Kim
2021-06-04 5:54 ` Daniel Rosenberg
2021-06-04 5:54 ` [f2fs-dev] " Daniel Rosenberg via Linux-f2fs-devel
2021-06-04 18:58 ` Theodore Ts'o
2021-06-04 18:58 ` [f2fs-dev] " Theodore Ts'o
2021-06-05 0:11 ` Chao Yu
2021-06-05 0:11 ` [f2fs-dev] " Chao Yu
2021-06-05 0:15 ` Jaegeuk Kim
2021-06-05 0:15 ` [f2fs-dev] " Jaegeuk Kim
2021-06-04 8:27 ` David Laight
2021-06-04 8:27 ` [f2fs-dev] " David Laight
2021-06-04 8:33 ` Greg KH
2021-06-04 8:33 ` [f2fs-dev] " Greg KH
2021-06-04 23:46 ` Chao Yu
2021-06-04 23:46 ` [f2fs-dev] " Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YLkezhSmr+aC0v9p@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=chao@kernel.org \
--cc=drosen@google.com \
--cc=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
--cc=krisman@collabora.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--subject='Re: [PATCH v2 2/2] f2fs: Advertise encrypted casefolding in sysfs' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.