[v2] btrfs: sysfs: accept size suffixes for read policy values

Commit Message

Anand Jain Jan. 29, 2025, 3:21 p.m. UTC

We now parse human-friendly size values (e.g. '1G', '2M') when setting
read policies.

Suggested-by: David Sterba <[e-mail]>
Reviewed-by: David Sterba <[e-mail]>
Signed-off-by: Anand Jain <[e-mail]>
---
 fs/btrfs/sysfs.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

David Sterba Feb. 5, 2025, 5:58 p.m. UTC | #1

On Wed, Jan 29, 2025 at 11:21:46PM +0800, Anand Jain wrote:
> We now parse human-friendly size values (e.g. '1G', '2M') when setting
> read policies.
> 
> Suggested-by: David Sterba <[e-mail]>
> Reviewed-by: David Sterba <[e-mail]>
> Signed-off-by: Anand Jain <[e-mail]>

v2 is ok, for simple updates like adding a comment you don't need to
resend it. Please add the patch to for-next, thanks.

David Sterba March 3, 2025, 9:12 a.m. UTC | #2

On Wed, Feb 05, 2025 at 06:58:10PM +0100, David Sterba wrote:
> On Wed, Jan 29, 2025 at 11:21:46PM +0800, Anand Jain wrote:
> > We now parse human-friendly size values (e.g. '1G', '2M') when setting
> > read policies.
> > 
> > Suggested-by: David Sterba <[e-mail]>
> > Reviewed-by: David Sterba <[e-mail]>
> > Signed-off-by: Anand Jain <[e-mail]>
> 
> v2 is ok, for simple updates like adding a comment you don't need to
> resend it. Please add the patch to for-next, thanks.

Now added to for-next.

Patch

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 53b846d99ece..cb6af316fffd 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1342,17 +1342,18 @@  int btrfs_read_policy_to_enum(const char *str, s64 *value_ret)
 	/* Separate value from input in policy:value format. */
 	value_str = strchr(param, ':');
 	if (value_str) {
-		int ret;
+		char *retptr;
 
 		*value_str = 0;
 		value_str++;
 		if (!value_ret)
 			return -EINVAL;
-		ret = kstrtos64(value_str, 10, value_ret);
-		if (ret)
+
+		*value_ret = memparse(value_str, &retptr);
+		/* There could be any trailing typos after the value. */
+		retptr = skip_spaces(retptr);
+		if (*retptr != 0 || *value_ret <= 0)
 			return -EINVAL;
-		if (*value_ret < 0)
-			return -ERANGE;
 	}
 #endif