Skip to contentSkip to conversation

generic/020: fix another really long attr test failure for ceph

PATCH In review [email protected] 2 participants 2 messages Mar 19, 2023 – Mar 21, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic/020: fix another really long attr test failure for ceph

From: Xiubo Li <[email protected]>

If the CONFIG_CEPH_FS_SECURITY_LABEL is disabled the kernel ceph the 'selinux_size' will be empty and then:
max_attrval_size=$((65536 - $size - $selinux_size - $max_attrval_namelen)) will be:
max_attrval_size=$((65536 - $size - - $max_attrval_namelen)) which equals to:
max_attrval_size=$((65536 - $size + $max_attrval_namelen))

---
 tests/generic/020 | 6 ++++++
 1 file changed, 6 insertions(+)
tests/generic/020 +6 -0
index 538a24c6..e00365a9 100755
@@ -154,6 +154,12 @@ _attr_get_maxval_size()
 			awk -F "=0x" '/^user/ {len += length($1) + length($2) / 2} END {print len}')
 		local selinux_size=$(getfattr -n 'security.selinux' --dump -e hex $filename 2>/dev/null | \
 			awk -F "=0x" '/^security/ {len += length($1) + length($2) / 2} END {print len}')
+		if [ -z $size ]; then
+			size=0
+		fi
+		if [ -z $selinux_size ]; then
+			selinux_size=0
+		fi
 		max_attrval_size=$((65536 - $size - $selinux_size - $max_attrval_namelen))
 		;;
 	*)
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · On Sun, Mar 19, 2023 at 02:29:27PM +0800, [email protected] wrote:

From: Xiubo Li <[email protected]>

If the CONFIG_CEPH_FS_SECURITY_LABEL is disabled the kernel ceph the 'selinux_size' will be empty and then:
max_attrval_size=$((65536 - $size - $selinux_size - $max_attrval_namelen)) will be:
max_attrval_size=$((65536 - $size - - $max_attrval_namelen)) which equals to:
max_attrval_size=$((65536 - $size + $max_attrval_namelen))

Quoted 2 lines

---

Makes sense to me,

Quoted 23 lines
 tests/generic/020 | 6 ++++++
 1 file changed, 6 insertions(+)
tests/generic/020 +6 -0
index 538a24c6..e00365a9 100755
@@ -154,6 +154,12 @@ _attr_get_maxval_size()
 			awk -F "=0x" '/^user/ {len += length($1) + length($2) / 2} END {print len}')
 		local selinux_size=$(getfattr -n 'security.selinux' --dump -e hex $filename 2>/dev/null | \
 			awk -F "=0x" '/^security/ {len += length($1) + length($2) / 2} END {print len}')
+		if [ -z $size ]; then
+			size=0
+		fi
+		if [ -z $selinux_size ]; then
+			selinux_size=0
+		fi
 		max_attrval_size=$((65536 - $size - $selinux_size - $max_attrval_namelen))
 		;;
 	*)
Signature · 1 line
2.31.1