Skip to contentSkip to conversation

casefold: Fix expansion of seqres variable

PATCH Superseded Gabriel Krisman Bertazi 3 participants 3 messages May 11, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 casefold: Fix expansion of seqres variable

seqres is not properly expanded on these error paths, causing a file called seqres.full to be created instead.

---
 common/casefold | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/casefold +2 -2
index 9172d818125a..7e8f941211db 100644
@@ -25,7 +25,7 @@ _require_scratch_casefold()
 		_notrun "$FSTYP does not support casefold feature"
 	fi
 
-	if ! _scratch_mkfs_casefold &>>seqres.full; then
+	if ! _scratch_mkfs_casefold &>>$seqres.full; then
 		_notrun "$FSTYP userspace tools do not support casefold"
 	fi
 
@@ -33,7 +33,7 @@ _require_scratch_casefold()
 	# defined by the userspace tools.  This will fail if
 	# the userspace tool used a more recent encoding than the one
 	# supported in kernel space.
-	if ! _try_scratch_mount &>>seqres.full; then
+	if ! _try_scratch_mount &>>$seqres.full; then
 		_notrun "kernel can't mount filesystem with the encoding set by userspace"
 	fi
 	_scratch_unmount
Signature · 1 line
2.35.3
#1 lore raw
Quoted 13 lines · Gabriel Krisman Bertazi

seqres is not properly expanded on these error paths, causing a file called seqres.full to be created instead.

---
 common/casefold | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/casefold +0 -0
index 9172d818125a..7e8f941211db 100644

common/casefold _require_scratch_casefold() · line 28

Quoted 5 lines
common/casefold +1 -1
@@ -25,7 +25,7 @@ _require_scratch_casefold()
 		_notrun "$FSTYP does not support casefold feature"
 	fi
 
-	if ! _scratch_mkfs_casefold &>>seqres.full; then
+	if ! _scratch_mkfs_casefold &>>$seqres.full; then

PLease add a space between the &>> and $seqres.full while you are fixing this. It's unreadable without proper whitespace separation...

Cheers,

Dave.

Signature · 2 lines
Dave Chinner
[email protected]
#2 lore raw
Quoted 17 lines · Dave Chinner
Quoted 16 lines · Gabriel Krisman Bertazi

seqres is not properly expanded on these error paths, causing a file called seqres.full to be created instead.

---
 common/casefold | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/casefold +0 -0
index 9172d818125a..7e8f941211db 100644
@@ -25,7 +25,7 @@ _require_scratch_casefold()
 		_notrun "$FSTYP does not support casefold feature"
 	fi
 
Quoted 2 lines

common/casefold _require_scratch_casefold() · line 28

Quoted 2 lines
common/casefold +1 -1
-	if ! _scratch_mkfs_casefold &>>seqres.full; then
+	if ! _scratch_mkfs_casefold &>>$seqres.full; then

By running grep -rsn seqres|grep -v \$seqres, I think this's only one file we missed '$' for 'seqres'. So this fix is good to me. And...

Quoted 3 lines

PLease add a space between the &>> and $seqres.full while you are fixing this. It's unreadable without proper whitespace separation...

I'll merge your V2 patch, after you change it as Dave suggested above.

Thanks,
Zorro

Quoted 8 lines

Cheers,

Dave.

Signature · 2 lines
Dave Chinner
[email protected]