From 2df770535a7947271b875a6ec76a213784da7f9b Mon Sep 17 00:00:00 2001
From: Ziye Yang <ziye.yang@intel.com>
Date: Tue, 12 Nov 2019 19:52:53 +0800
Subject: [PATCH] test/ceph: fix the dev name in start and stop.sh

I am confused with the dev_backend variable, I think that
we may not need this variable.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: I26fa5e8a829e574bb1b97add753b21ad1b0fc23e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473910
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: yidong0635 <dongx.yi@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 scripts/ceph/start.sh | 7 +++----
 scripts/ceph/stop.sh  | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/ceph/start.sh b/scripts/ceph/start.sh
index efea26b40..b4de69142 100755
--- a/scripts/ceph/start.sh
+++ b/scripts/ceph/start.sh
@@ -12,12 +12,11 @@ mon_dir=${base_dir}/mon.a
 pid_dir=${base_dir}/pid
 ceph_conf=${base_dir}/ceph.conf
 mnt_dir=${base_dir}/mnt
-dev_backend=/dev/ceph
 image=/var/tmp/ceph_raw.img
 dev=/dev/loop200
 
 umount ${dev}p2 || true
-losetup -d $dev_backend || true
+losetup -d $dev || true
 
 # partition osd
 if [ -d $base_dir ]; then
@@ -30,8 +29,8 @@ if [ ! -e $image ]; then
         fallocate -l 4G $image
 fi
 
-mknod ${dev_backend} b 7 200 || true
-losetup ${dev_backend} ${image} || true
+mknod ${dev} b 7 200 || true
+losetup ${dev} ${image} || true
 
 PARTED="parted -s"
 SGDISK="sgdisk"
diff --git a/scripts/ceph/stop.sh b/scripts/ceph/stop.sh
index 5c1c4a950..40bcf8a7e 100755
--- a/scripts/ceph/stop.sh
+++ b/scripts/ceph/stop.sh
@@ -4,10 +4,10 @@ set -x
 
 base_dir=/var/tmp/ceph
 image=${base_dir}/ceph_raw.img
-dev_backend=/dev/ceph
+dev=/dev/loop200
 
 pkill -9 ceph
 sleep 3
-umount /dev/loop200p2
-losetup -d $dev_backend
+umount ${dev}p2
+losetup -d $dev
 rm -rf $base_dir