public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Zorro Lang <zlang@kernel.org>
To: fstests@vger.kernel.org
Cc: djwong@kernel.org
Subject: [PATCH] common/atomicwrites: fix _require_scratch_write_atomic when awu_max_fs is empty
Date: Sat,  6 Sep 2025 21:17:22 +0800	[thread overview]
Message-ID: <20250906131722.1333025-1-zlang@kernel.org> (raw)

If a kernel doesn't support atomic write, _get_atomic_write_unit_min
and _get_atomic_write_unit_max will get nothing.

  local awu_min_bdev=$(_get_atomic_write_unit_min $SCRATCH_DEV)
  local awu_max_bdev=$(_get_atomic_write_unit_max $SCRATCH_DEV)

If $awu_min_bdev and $awu_max_bdev are empty, then the logic likes
"[ $awu_min_bdev -eq 0 ] && [ $awu_max_bdev -eq 0 ]" is meaningless,
and it causes g/767 hang on system which doesn't support atomic
write.

Signed-off-by: Zorro Lang <zlang@kernel.org>
---
 common/atomicwrites | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/atomicwrites b/common/atomicwrites
index 33526399d..bbcc4e7c5 100644
--- a/common/atomicwrites
+++ b/common/atomicwrites
@@ -47,8 +47,9 @@ _require_scratch_write_atomic_multi_fsblock()
 
 	_scratch_unmount
 
-	test $awu_max_fs -ge $((bsize * 2)) || \
+	if [ -z "$awu_max_fs" -o $awu_max_fs -lt $((bsize * 2)) ];then
 		_notrun "multi-block atomic writes not supported by this filesystem"
+	fi
 }
 
 _require_scratch_write_atomic()
@@ -58,7 +59,8 @@ _require_scratch_write_atomic()
 	local awu_min_bdev=$(_get_atomic_write_unit_min $SCRATCH_DEV)
 	local awu_max_bdev=$(_get_atomic_write_unit_max $SCRATCH_DEV)
 
-	if [ $awu_min_bdev -eq 0 ] && [ $awu_max_bdev -eq 0 ]; then
+	if [ -z "$awu_min_bdev" -o -z "$awu_max_bdev" ] || \
+		[ $awu_min_bdev -eq 0 -a $awu_max_bdev -eq 0 ];then
 		_notrun "write atomic not supported by this block device"
 	fi
 
@@ -75,7 +77,8 @@ _require_scratch_write_atomic()
 
 	_scratch_unmount
 
-	if [ $awu_min_fs -eq 0 ] && [ $awu_max_fs -eq 0 ]; then
+	if [ -z "$awu_min_fs" -o -z "$awu_max_fs" ] || \
+		[ $awu_min_fs -eq 0 -a $awu_max_fs -eq 0 ];then
 		_notrun "write atomic not supported by this filesystem"
 	fi
 }
-- 
2.49.0


             reply	other threads:[~2025-09-06 13:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-06 13:17 Zorro Lang [this message]
2025-10-20 11:33 ` [PATCH] common/atomicwrites: fix _require_scratch_write_atomic when awu_max_fs is empty Pavel Reichl
2025-11-14 10:24 ` Ojaswin Mujoo
2025-11-14 16:17   ` Zorro Lang

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=20250906131722.1333025-1-zlang@kernel.org \
    --to=zlang@kernel.org \
    --cc=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox