[PATCH v2] btrfs/333: require scratch before checking encoded reads

[PATCH v2] btrfs/333: require scratch before checking encoded reads

[Prabhakar Pujeri]

_require_btrfs_iouring_encoded_read() formats and mounts the scratch
device while checking for encoded-read support.  Without a configured
scratch device, callers therefore fail inside the helper before any
scratch requirement is checked.

Add _require_scratch at the top of the helper so that all of its
callers skip cleanly when no scratch device is present.

Changes in v2:
- Move _require_scratch into _require_btrfs_iouring_encoded_read() so
  the requirement is enforced for all callers of the helper, per Qu
  Wenruo's suggestion.  Revert the v1 caller-side change in btrfs/333.
- Cc Qu Wenruo.

v1: https://lore.kernel.org/fstests/20260831104200.2269-1-prabhakar.pujeri@dell.com/

Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@dell.com>
---
 common/btrfs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/btrfs b/common/btrfs
index a75fbf1..ccac862 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -1055,6 +1055,7 @@ _require_btrfs_iouring_encoded_read()
 	local tmpfile
 	local ret
 
+	_require_scratch
 	_require_command src/btrfs_encoded_read
 
 	_scratch_mkfs &> /dev/null
-- 
2.55.0

Re: [PATCH v2] btrfs/333: require scratch before checking encoded reads

[Qu Wenruo]

在 2026/9/2 13:03, Prabhakar Pujeri 写道:
> _require_btrfs_iouring_encoded_read() formats and mounts the scratch
> device while checking for encoded-read support.  Without a configured
> scratch device, callers therefore fail inside the helper before any
> scratch requirement is checked.
> 
> Add _require_scratch at the top of the helper so that all of its
> callers skip cleanly when no scratch device is present.
> 
> Changes in v2:
> - Move _require_scratch into _require_btrfs_iouring_encoded_read() so
>    the requirement is enforced for all callers of the helper, per Qu
>    Wenruo's suggestion.  Revert the v1 caller-side change in btrfs/333.
> - Cc Qu Wenruo.
> 
> v1: https://lore.kernel.org/fstests/20260831104200.2269-1-prabhakar.pujeri@dell.com/

Change log should be put after the "---" line.

Otherwise looks good to me.

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu
> 
> Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@dell.com>
> ---
>   common/btrfs | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/common/btrfs b/common/btrfs
> index a75fbf1..ccac862 100644
> --- a/common/btrfs
> +++ b/common/btrfs
> @@ -1055,6 +1055,7 @@ _require_btrfs_iouring_encoded_read()
>   	local tmpfile
>   	local ret
>   
> +	_require_scratch
>   	_require_command src/btrfs_encoded_read
>   
>   	_scratch_mkfs &> /dev/null