fix review comments

Signed-off-by: Hua Huang <hua.huang@seagate.com>
Seagate · Jul 22, 2022 · b6a275a · b6a275a
1 parent f4ce4f5
commit b6a275a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/m0t1fs/linux_kernel/st/m0t1fs_common_inc.sh b/m0t1fs/linux_kernel/st/m0t1fs_common_inc.sh
@@ -81,7 +81,7 @@ IOS5_CMD=""       #IOS5 process commandline to spawn it again on Controller even
 
 IOS4_CMD=""
 
-export IOS_DISK_BLOCK_COUNT=1M
+export IOS_DISK_SEEK_BLOCK_COUNT=1M
 
 # list of md server end points tmid in [800, 899)
 MDSEP=(

diff --git a/m0t1fs/linux_kernel/st/m0t1fs_server_inc.sh b/m0t1fs/linux_kernel/st/m0t1fs_server_inc.sh
@@ -95,7 +95,7 @@ EOF
 	for (( ; DDEV_ID < $dev_end; DDEV_ID++)) ; do
 		conf_ios_device_setup $DDEV_ID $id_count id_count "$ids" ids
 
-		dd if=/dev/zero of=$DDEV_ID$ddisk bs=1M seek=$IOS_DISK_BLOCK_COUNT count=1 ||
+		dd if=/dev/zero of=$DDEV_ID$ddisk bs=1M seek=$IOS_DISK_SEEK_BLOCK_COUNT count=1 ||
 			return 1
 		if [ ! -e /dev/loop$DDEV_ID ]; then
 			create_loop_device $DDEV_ID

diff --git a/motr/st/utils/copy.c b/motr/st/utils/copy.c
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
 	client_fini(m0_instance);
 
-	return rc == 0 ? 0 : -rc;
+	return -rc;
 }
 
 /*

diff --git a/motr/st/utils/motr_io_small_disks.sh b/motr/st/utils/motr_io_small_disks.sh
@@ -32,7 +32,7 @@ TOPDIR=$(dirname "$0")/../../../
 export MOTR_CLIENT_ONLY=1
 
 # The ioservice will have a very small disk to trigger -ENOSPC test
-export IOS_DISK_BLOCK_COUNT=500
+export IOS_DISK_SEEK_BLOCK_COUNT=500
 
 motr_io_small_disks()
 {