Merge branch 'for-6.13/block' into for-next

* for-6.13/block: Revert "blk-throttle: Fix IO hang for a corner case"
intel-lab-lkp · Oct 16, 2024 · dcdcc9b · dcdcc9b
2 parents a151f85 + 97550f7
commit dcdcc9b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
@@ -1485,13 +1485,13 @@ static ssize_t tg_set_limit(struct kernfs_open_file *of,
 			goto out_finish;
 
 		ret = -EINVAL;
-		if (!strcmp(tok, "rbps") && val > 1)
+		if (!strcmp(tok, "rbps"))
 			v[0] = val;
-		else if (!strcmp(tok, "wbps") && val > 1)
+		else if (!strcmp(tok, "wbps"))
 			v[1] = val;
-		else if (!strcmp(tok, "riops") && val > 1)
+		else if (!strcmp(tok, "riops"))
 			v[2] = min_t(u64, val, UINT_MAX);
-		else if (!strcmp(tok, "wiops") && val > 1)
+		else if (!strcmp(tok, "wiops"))
 			v[3] = min_t(u64, val, UINT_MAX);
 		else
 			goto out_finish;